diff options
| author | Palmer Dabbelt <palmer@dabbelt.com> | 2017-05-15 17:45:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-15 17:45:17 -0700 |
| commit | 14511b8316f11effd93ae71bfcd1413ef127e1bf (patch) | |
| tree | e9b521bbdd8be4d908fbed3128dcdbfbbb01b2d1 /debug/testlib.py | |
| parent | f7095baa9d9a23ad096084380a9457730ea2ac68 (diff) | |
| parent | e73b73034d706cf52b499b1e69c69e3da3925e6d (diff) | |
| download | riscv-tests-14511b8316f11effd93ae71bfcd1413ef127e1bf.zip riscv-tests-14511b8316f11effd93ae71bfcd1413ef127e1bf.tar.gz riscv-tests-14511b8316f11effd93ae71bfcd1413ef127e1bf.tar.bz2 | |
Merge pull request #48 from riscv/tests
Get the test running on Spike again
Diffstat (limited to 'debug/testlib.py')
| -rw-r--r-- | debug/testlib.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/debug/testlib.py b/debug/testlib.py index df976df..ecb0431 100644 --- a/debug/testlib.py +++ b/debug/testlib.py @@ -67,7 +67,9 @@ class Spike(object): spike = os.path.expandvars("$RISCV/bin/spike") cmd = [spike] if xlen == 32: - cmd += ["--isa", "RV32"] + cmd += ["--isa", "RV32G"] + else: + cmd += ["--isa", "RV64G"] if timeout: cmd = ["timeout", str(timeout)] + cmd @@ -77,7 +79,6 @@ class Spike(object): if with_jtag_gdb: cmd += ['--rbb-port', '0'] os.environ['REMOTE_BITBANG_HOST'] = 'localhost' - cmd.append("-m32") cmd.append('programs/infinite_loop') if binary: cmd.append(binary) @@ -538,7 +539,8 @@ class GdbTest(BaseTest): self.gdb.command( "target extended-remote localhost:%d" % self.server.port) - self.gdb.p("$priv=3") + # FIXME: OpenOCD doesn't handle PRIV now + #self.gdb.p("$priv=3") def classTeardown(self): del self.gdb |