diff options
| author | Prashanth Mundkur <prashanth.mundkur@gmail.com> | 2019-05-14 17:23:35 -0700 |
|---|---|---|
| committer | Prashanth Mundkur <prashanth.mundkur@gmail.com> | 2019-05-14 17:23:35 -0700 |
| commit | 798066304a257e843b00b7c8fbf6e242dc0fddad (patch) | |
| tree | 860b9f08d9f33f938b5ec3649ea6f9daa25e8c5d | |
| parent | a83d6730a22b7980e33dde02a72c84cd217706ca (diff) | |
| parent | e856fb164ebe6e82fa696b3672a3352f21d8a3d7 (diff) | |
| download | sail-riscv-798066304a257e843b00b7c8fbf6e242dc0fddad.zip sail-riscv-798066304a257e843b00b7c8fbf6e242dc0fddad.tar.gz sail-riscv-798066304a257e843b00b7c8fbf6e242dc0fddad.tar.bz2 | |
Merge branch 'master' into master-cleanup
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | model/riscv_insts_rmem.sail | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -312,7 +312,7 @@ generated_definitions/for-rmem/riscv.lem: $(SAIL_RMEM_SRCS) generated_definitions/for-rmem/riscv_toFromInterp2.ml: $(SAIL_RMEM_SRCS) mkdir -p $(dir $@) - $(SAIL) $(SAIL_FLAGS) -tofrominterp -tofrominterp_lem -tofrominterp_output_dir $(dir $@) -o riscv $^ + $(SAIL) $(SAIL_FLAGS) -tofrominterp -tofrominterp_lem -tofrominterp_mwords -tofrominterp_output_dir $(dir $@) -o riscv $^ generated_definitions/for-rmem/riscv.defs: $(SAIL_RMEM_SRCS) mkdir -p $(dir $@) diff --git a/model/riscv_insts_rmem.sail b/model/riscv_insts_rmem.sail index 9d2893a..1f9ab37 100644 --- a/model/riscv_insts_rmem.sail +++ b/model/riscv_insts_rmem.sail @@ -9,7 +9,7 @@ union clause ast = STOP_FETCHING : unit mapping clause encdec = STOP_FETCHING() <-> 0xfade @ 0b00000000 @ 0b0 @ 0b00 @ 0b010 @ 0b11 -function clause execute (STOP_FETCHING()) = true +function clause execute (STOP_FETCHING()) = RETIRE_SUCCESS mapping clause assembly = STOP_FETCHING() <-> "stop_fetching" @@ -19,6 +19,6 @@ union clause ast = THREAD_START : unit mapping clause encdec = THREAD_START() <-> 0xc0de @ 0b00000000 @ 0b0 @ 0b00 @ 0b010 @ 0b11 -function clause execute (THREAD_START()) = true +function clause execute (THREAD_START()) = RETIRE_SUCCESS mapping clause assembly = THREAD_START() <-> "thread_start" |