Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue 132: Cleanup of the various incoming RISC-V-related code that is already merged in. #141

Merged
merged 2 commits into from
Dec 1, 2019
Merged

Issue 132: Cleanup of the various incoming RISC-V-related code that is already merged in. #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
459db71
Cleanup of the various incoming RISC-V-related code that is already m…
phillipstanleymarbell Dec 1, 2019
875d8bd
Merge branch 'master' into issue-132
phillipstanleymarbell Dec 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions benchmarks/source/histogram_simple_test/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
`run.m` fails with unrecognised command, as it seems stuck on the superH branch, even though typing the same commands by hand in sunflower works (where it picks up the riscv branch commands)

(See issue #131).
3 changes: 2 additions & 1 deletion sim/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ OBJS =\
sf-hitachi-sh.o\
sf-riscv.o\
taint.o\
uncertain-histogram.o\
# decode-ti-msp430.o\
# dev430x1xx.o\
# machine-ti-msp430.o\
Expand Down Expand Up @@ -162,7 +163,7 @@ decode-riscv.h: latencies-riscv.h Makefile

# Either of the lex-* would suffice for generating the LaTeX / help command array.
# TODO Changed to riscv for now. This should be properly implemented as a union of lex-*, considering which
# parts of riscv/superh(/...) are duplicates
# parts of riscv/superh(/...) are duplicates. See issue #127.
help.h: lex-hitachi-sh.c Makefile
./mkhelp $(GAWK) > help.h

Expand Down
2 changes: 2 additions & 0 deletions sim/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,7 @@
#define SF_BPTS 1
#define SF_TRAJECTORIES 1
#define SF_TAINTANALYSIS 1
#define SF_UNCERTAIN_UPE 1
#define SF_UNCERTAIN_HISTOGRAM 1
#define SF_NUMA 1
#define SF_EMBEDDED 0
2 changes: 1 addition & 1 deletion sim/decode-hitachi-sh.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* This is dependent on latencies-hitachi-sh.h */
/* DO NOTE EDIT! This file is auto-generated from latencies-hitachi-sh.h */
enum
{
SUPERH_OP_ADD,
Expand Down
2 changes: 1 addition & 1 deletion sim/decode-riscv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* This is dependent on latencies-riscv.h */
/* DO NOTE EDIT! This file is auto-generated from latencies-riscv.h. */
enum
{
RISCV_OP_LUI,
Expand Down
Loading