commit cb8692fdbec1ed7d01d69f425360e1d9b3461038
author Timothy Chen <timothytim@google.com> Wed Oct 30 22:27:57 2019 -0700
committer tjaychen <timothytim@google.com> Thu Oct 31 10:01:21 2019 -0700
tree bf26cbe594aa7508b395242311fba9b148243583
parent 5f7b9c4afbefbbbcedc7cb041e850c2c8d7f17c7

[sw] Change update_mtvec handling

update_mtvec used to look for an external definition of the
_svectors varibale, now it simply receives it as an argument.

sw/device/exts/common/_crt.c

diff --git a/sw/device/exts/common/_crt.c b/sw/device/exts/common/_crt.c
index 109a92d..c5a65f2 100644
--- a/sw/device/exts/common/_crt.c
+++ b/sw/device/exts/common/_crt.c
@@ -11,13 +11,14 @@
 
 void _crt(void) __attribute__((section(".crt")));
 void _crt(void) {
+  extern char _svectors[];
   extern char _sdata[];
   extern char _idata[];
   extern char _edata[];
   extern char _bss_start[];
   extern char _bss_end[];
 
-  update_mtvec();
+  update_mtvec(_svectors);
   memcpy(_sdata, _idata, _edata - _sdata);
   memset(_bss_start, 0, _bss_end - _bss_start);
 

sw/device/lib/irq.h

diff --git a/sw/device/lib/irq.h b/sw/device/lib/irq.h
index a992889..316b5ed 100644
--- a/sw/device/lib/irq.h
+++ b/sw/device/lib/irq.h
@@ -11,7 +11,7 @@
 /**
  * Update to the location of vectors as specificed in the linker file
  */
-extern void update_mtvec(void);
+extern void update_mtvec(char *ptr);
 
 /**
  * Enable / disable ibex globlal interrupts

sw/device/lib/irq_vectors.S

diff --git a/sw/device/lib/irq_vectors.S b/sw/device/lib/irq_vectors.S
index 5d16746..456d2ab 100644
--- a/sw/device/lib/irq_vectors.S
+++ b/sw/device/lib/irq_vectors.S
@@ -6,12 +6,10 @@
 .extern handler_irq_software
 .extern handler_irq_timer
 .extern handler_irq_external
-.extern _svectors
 
 update_mtvec:
   .section .text
   .global update_mtvec
-  la a0, _svectors
   csrw mtvec, a0
   ret