Merge pull request #563 from RISCVERS/fix-snapshot

emu,difftest: fix get_nemu_this_pc and set_nemu_this_pc api for snaps…

src/test/csrc/difftest.h

@@ -98,7 +98,7 @@ int difftest_step(DiffState *s, int coreid);
 int difftest_store_step(uint64_t *saddr, uint64_t *sdata, uint8_t *smask, int coreid);
 void difftest_display(uint8_t mode, int coreid);
 
-uint64_t get_nemu_this_pc();
-void set_nemu_this_pc(uint64_t pc);
+uint64_t get_nemu_this_pc(int coreid);
+void set_nemu_this_pc(uint64_t pc, int coreid);
 
 #endif

src/test/csrc/emu.cpp

@@ -816,7 +816,7 @@ void Emulator::snapshot_save(const char *filename) {
   ref_difftest_getregs(&ref_r, 0);
   stream.unbuf_write(ref_r, sizeof(ref_r));
 
-  uint64_t nemu_this_pc = get_nemu_this_pc();
+  uint64_t nemu_this_pc = get_nemu_this_pc(0);
   stream.unbuf_write(&nemu_this_pc, sizeof(nemu_this_pc));
 
   char *buf = (char *)mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0);
@@ -858,7 +858,7 @@ void Emulator::snapshot_load(const char *filename) {
 
   uint64_t nemu_this_pc;
   stream.read(&nemu_this_pc, sizeof(nemu_this_pc));
-  set_nemu_this_pc(nemu_this_pc);
+  set_nemu_this_pc(nemu_this_pc, 0);
 
   char *buf = (char *)mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0);
   stream.read(buf, size);