From 42c96608e6c6b8ae1c04cee798a06dea43a14442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Fr=C3=B6schle?= Date: Wed, 7 Aug 2013 19:29:55 +0000 Subject: [PATCH] corrected MMU locked TLB for RAM and Makefile (RAM load address) --- BaS_gcc/Makefile | 2 +- BaS_gcc/sources/mmu.S | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/BaS_gcc/Makefile b/BaS_gcc/Makefile index 5a72b7d..108aa6e 100644 --- a/BaS_gcc/Makefile +++ b/BaS_gcc/Makefile @@ -115,7 +115,7 @@ $(FLASH_EXEC): TARGET_ADDRESS=0xe0000000 $(FLASH_EXEC): LDCFILE=bas.lk $(FLASH_EXEC): MAPFILE=bas.map -$(RAM_EXEC): TARGET_ADDRESS=0x1f000000 +$(RAM_EXEC): TARGET_ADDRESS=0x1ff00000 $(RAM_EXEC): LDCFILE=ram.lk $(RAM_EXEC): MAPFILE=ram.map diff --git a/BaS_gcc/sources/mmu.S b/BaS_gcc/sources/mmu.S index dc23757..fbe731e 100644 --- a/BaS_gcc/sources/mmu.S +++ b/BaS_gcc/sources/mmu.S @@ -106,6 +106,7 @@ _mmu_init: move.l d0,_rt_acr2 // save shadow register clr.l d0 // acr3 off + //move.l #0x1F07C400,d0 // instruction r wt e000'0000-e07f'ffff movec d0,ACR3 move.l d0,_rt_acr3 // save shadow register @@ -165,10 +166,10 @@ _mmu_init: // 1ff0'0000 locked move.l #0x1FF00000|std_mmutr,d0 // last megabyte of RAM. Reserved for BaS move.l #0x1FF00000|copyback_mmudr|MCF_MMU_MMUDR_LK,d1 - move.l d0,MCF_MMU_MMUTR + move.l d0,MCF_MMU_MMUTR move.l d1,MCF_MMU_MMUDR move.l d2,MCF_MMU_MMUOR // setzen data - move.l d3,MCF_MMU_MMUOR // setzen instr + move.l d3,MCF_MMU_MMUOR // setzen instr // instr 0xFFF0'0000 nach 0x1FF0'0000 umleiten -->> short sprung /* move.l #0xFFF00000|std_mmutr,d0 move.l #0x1FF00000|copyback_mmudr|MCF_MMU_MMUDR_LK,d1