Renamed _Bas_base and __BAS_VMA to __BAS_IN_RAM.

This commit is contained in:
Vincent Rivière
2012-11-07 22:18:27 +00:00
parent 25b5df12b4
commit 4ec8898ed2
3 changed files with 10 additions and 11 deletions

View File

@@ -10,8 +10,6 @@
#include "cache.h"
#include "bas_printf.h"
extern uint32_t Bas_base[];
/* imported routines */
extern int mmu_init();
extern int vec_init();
@@ -28,6 +26,8 @@ extern uint8_t _STRAM_END[];
#define STRAM_END ((uint32_t)_STRAM_END)
extern uint8_t _TOS[];
#define TOS ((uint32_t)_TOS) /* final TOS location */
extern uint8_t _FASTRAM_END[];
#define FASTRAM_END ((uint32_t)_FASTRAM_END)
extern uint8_t _EMUTOS[];
#define EMUTOS ((uint32_t)_EMUTOS) /* where EmuTOS is stored in flash */
extern uint8_t _EMUTOS_SIZE[];
@@ -171,7 +171,7 @@ void BaS(void)
/* TT-RAM */
* (uint32_t *) 0x5a4 = (uint32_t) Bas_base; /* ramtop TOS system variable */
* (uint32_t *) 0x5a4 = (uint32_t) FASTRAM_END; /* ramtop TOS system variable */
* (uint32_t *) 0x5a8 = 0x1357bd13; /* ramvalid TOS system variable */
xprintf("init ACIA: ");

View File

@@ -756,8 +756,8 @@ extern uint8_t _FIRETOS[];
extern uint8_t _BAS_LMA[];
#define BAS_LMA ((uint32_t)_BAS_LMA) /* where the BaS is stored in flash */
extern uint8_t _BAS_VMA[];
#define BAS_VMA ((uint32_t)_BAS_VMA) /* where the BaS is run in RAM */
extern uint8_t _BAS_IN_RAM[];
#define BAS_IN_RAM ((uint32_t)_BAS_IN_RAM) /* where the BaS is run in RAM */
extern uint8_t _BAS_SIZE[];
#define BAS_SIZE ((uint32_t)_BAS_SIZE) /* size of the BaS, in bytes */
@@ -808,7 +808,7 @@ void initialize_hardware(void) {
/* copy the BaS code contained in flash to its final location */
src = (uint32_t *)BAS_LMA;
end = (uint32_t *)(BAS_LMA + BAS_SIZE);
dst = jmp = (uint32_t *)BAS_VMA;
dst = jmp = (uint32_t *)BAS_IN_RAM;
/* The linker script will ensure that the Bas size
* is a multiple of the following.