From 8d6a8bac53b6aeedc3e460a4b9cdcb070591f697 Mon Sep 17 00:00:00 2001
From: Michael McKeown <mmckeown@princeton.edu>
Date: Thu, 6 Sep 2018 16:33:12 -0700
Subject: Enable EXTRA_INIT macro to work in VM environment (#10)

---
 v/entry.S      | 1 +
 v/riscv_test.h | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/v/entry.S b/v/entry.S
index 9719662..e3b5a97 100644
--- a/v/entry.S
+++ b/v/entry.S
@@ -32,6 +32,7 @@ handle_reset:
   slli t0, t0, 12
   add sp, sp, t0
   csrw mscratch, sp
+  call extra_boot
   la a0, userstart
   j vm_boot
 
diff --git a/v/riscv_test.h b/v/riscv_test.h
index 8ca9ffd..751e037 100644
--- a/v/riscv_test.h
+++ b/v/riscv_test.h
@@ -15,6 +15,10 @@
 #undef RVTEST_CODE_BEGIN
 #define RVTEST_CODE_BEGIN                                               \
         .text;                                                          \
+        .global extra_boot;                                             \
+extra_boot:                                                             \
+        EXTRA_INIT                                                      \
+        ret;                                                            \
         .global userstart;                                              \
 userstart:                                                              \
         init
-- 
cgit v1.1