Merge remote-tracking branch 'origin/master' into perf-debug

src/test/csrc/emu.cpp

@@ -81,6 +81,9 @@ Emulator::Emulator(int argc, const char *argv[]):
   srand48(args.seed);
   Verilated::randReset(2);
 
+  // init core
+  reset_ncycles(10);
+
   // init ram
   extern void init_ram(const char *img);
   init_ram(args.image);
@@ -104,9 +107,6 @@ Emulator::Emulator(int argc, const char *argv[]):
   enable_waveform = false;
 #endif
 
-  // init core
-  reset_ncycles(10);
-
   if (args.snapshot_path != NULL) {
     printf("loading from snapshot `%s`...\n", args.snapshot_path);
     snapshot_load(args.snapshot_path);