From 0b8ad7d5c65f5272339532837e3cb4327468a7fe Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Sun, 25 Nov 2018 20:37:20 +0000 Subject: [PATCH] zxdiv: Clean up memory arrangement a bit --- Kernel/platform-zxdiv/crt0.s | 13 ++++--------- Kernel/platform-zxdiv/rules.mk | 3 --- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/Kernel/platform-zxdiv/crt0.s b/Kernel/platform-zxdiv/crt0.s index 8801dde7..3e4caa8f 100644 --- a/Kernel/platform-zxdiv/crt0.s +++ b/Kernel/platform-zxdiv/crt0.s @@ -5,7 +5,6 @@ .area _CONST .area _COMMONMEM .area _STUBS - .area _INITIALIZER ; ; The writeables cannot start until 0x2000 but for simplicity ; we just start at 0x2000 for now, otherwise we have to fight @@ -22,8 +21,6 @@ .area _HEAP .area _GSINIT .area _GSFINAL - ; We moved our font elsewhere - .area _FONT ; ; Finally the buffers so they can expand ; @@ -33,16 +30,14 @@ ; .area _CODE1 .area _CODE2 - ; - ; Code3 sits above the display area along with the video - ; code so that they can access the display easily. It lives at - ; 0xDB00 therefore - ; .area _CODE3 .area _VIDEO + .area _FONT ; Discard is dumped in at 0x8000 and will be blown away later. .area _DISCARD + ; Somewhere to throw it out of the way + .area _INITIALIZER ; imported symbols .globl _fuzix_main @@ -127,7 +122,7 @@ _marker: .area _STUBS stubs: - .ds 768 + .ds 512 .area _BUFFERS ; diff --git a/Kernel/platform-zxdiv/rules.mk b/Kernel/platform-zxdiv/rules.mk index 9266fa42..58567b35 100644 --- a/Kernel/platform-zxdiv/rules.mk +++ b/Kernel/platform-zxdiv/rules.mk @@ -15,6 +15,3 @@ export CROSS_CC_SYS2=--codeseg CODE1 export CROSS_CC_SYS3=--codeseg CODE1 export CROSS_CC_SYS4=--codeseg CODE3 export CROSS_CC_SYS5=--codeseg CODE3 -# The banking default is to put fonts in bank3. We don't want this so build -# our font as CONST so it lands where we want it -export CROSS_CC_FONT=--constseg CONST \ No newline at end of file -- 2.34.1