arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-12 18:49:07 +00:00
Code Issues Releases Wiki Activity

util: Add load_vector_table

Browse Source
This commit is contained in:
Saleem Rashid 2017-07-01 20:08:26 +01:00 committed by Pavol Rusnak
parent 498d689f98
commit f23489050a
5 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bootloader/bootloader.c
View File

@ -78,18 +78,7 @@ void show_unofficial_warning(const uint8_t *hash)
void __attribute__((noreturn)) load_app(void)
{
// Relocate vector tables
SCB_VTOR = FLASH_APP_START; // & 0xFFFF;
// Set stack pointer
__asm__ volatile("msr msp, %0"::"g" (*(volatile uint32_t *)FLASH_APP_START));
// Jump to address
(*(void (**)())(FLASH_APP_START + 4))();
// forever loop to indicate to the compiler that this function does not return.
// this avoids the stack protector injecting code that faults with the new stack.
for (;;);
load_vector_table((const vector_table_t *) FLASH_APP_START);
}
bool firmware_present(void)

21
firmware/fastflash.c
View File

@ -18,15 +18,14 @@
*/
#include "fastflash.h"
#include "util.h"
#include <stdbool.h>
#include <stdint.h>
#include <string.h>
#include <libopencm3/cm3/scb.h>
extern uint32_t __bootloader_loadaddr__[];
extern uint32_t __bootloader_runaddr__[];
extern uint8_t __bootloader_loadaddr__[];
extern uint8_t __bootloader_runaddr__[];
extern uint8_t __bootloader_size__[];
void load_bootloader(void)
@ -34,19 +33,7 @@ void load_bootloader(void)
memcpy(__bootloader_runaddr__, __bootloader_loadaddr__, (size_t) __bootloader_size__);
}
// adapted from load_app() in bootloader.c
void __attribute__((noreturn)) run_bootloader(void)
{
// Relocate vector tables
SCB_VTOR = (uint32_t) __bootloader_runaddr__;
// Set stack pointer
__asm__ volatile("msr msp, %0":: "r" (__bootloader_runaddr__[0]));
// Jump to address
((void (*)(void))(__bootloader_runaddr__[1]))();
// forever loop to indicate to the compiler that this function does not return.
// this avoids the stack protector injecting code that faults with the new stack.
for (;;);
load_vector_table((const vector_table_t *) __bootloader_runaddr__);
}

1
timer.c
View File

@ -22,6 +22,7 @@
#include <libopencm3/stm32/rcc.h>
#include <libopencm3/cm3/systick.h>
#include <libopencm3/cm3/vector.h>
/* 1 tick = 1 ms */
volatile uint32_t system_millis;

4
timer.h
View File

@ -17,6 +17,8 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __TIMER_H__
#define __TIMER_H__
#include <stdint.h>
@ -28,4 +30,4 @@ extern uint32_t system_millis_lock_start;
void timer_init(void);
void sys_tick_handler(void);
#endif

17
util.h
View File

@ -22,6 +22,9 @@
#include <stdint.h>
#include <libopencm3/cm3/scb.h>
#include <libopencm3/cm3/vector.h>
void delay(uint32_t wait);
// converts uint32 to hexa (8 digits)
@ -38,4 +41,18 @@ void __attribute__((noreturn)) system_halt(void);
// reset system
void __attribute__((noreturn)) system_reset(void);
static inline void __attribute__((noreturn)) load_vector_table(const vector_table_t *vector_table) {
// Relocate vector table
SCB_VTOR = (uint32_t) vector_table;
// Set stack pointer
__asm__ volatile("msr msp, %0" :: "r" (vector_table->initial_sp_value));
// Jump to address
vector_table->reset();
// Prevent compiler from generating stack protector code (which causes CPU fault because the stack is moved)
for (;;);
}
#endif