From 16e11626d67505a73079f25860c9401bdbeab2d2 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Tue, 16 Jun 2015 13:35:37 +0100 Subject: [PATCH] micropack: straighten out defines This is our starting point for a minimal build and for Z80 gets us an 0x6000 (strictly 0x5F00) sized user space which we could push up to 0x6200. Our target is 0x7D00, however 0x6000 is enough to run many of the apps/tools. --- Kernel/platform-micropack/config.h | 2 +- Kernel/platform-micropack/fuzix.lnk | 4 ++-- Kernel/platform-micropack/kernel.def | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Kernel/platform-micropack/config.h b/Kernel/platform-micropack/config.h index 9141e6d1..9019ca12 100644 --- a/Kernel/platform-micropack/config.h +++ b/Kernel/platform-micropack/config.h @@ -25,7 +25,7 @@ #define TICKSPERSEC 100 /* Ticks per second */ #define PROGBASE 0x0000 /* also data base */ #define PROGLOAD 0x0100 -#define PROGTOP 0x7D00 /* Top of program, base of U_DATA */ +#define PROGTOP 0x6000 /* Top of program, base of U_DATA */ #define PROC_SIZE 32 /* Memory needed per process */ #define SWAP_SIZE 0x40 /* 32K in blocks (we actually don't need the low 256) */ diff --git a/Kernel/platform-micropack/fuzix.lnk b/Kernel/platform-micropack/fuzix.lnk index ac44daaa..07a1f7a4 100644 --- a/Kernel/platform-micropack/fuzix.lnk +++ b/Kernel/platform-micropack/fuzix.lnk @@ -1,8 +1,8 @@ -mwxuy -i fuzix.ihx -b _DISCARD=0x5000 --b _UDATA=0x5D00 --b _CODE=0x6000 +-b _UDATA=0x6000 +-b _CODE=0x6300 -l z80 platform-micropack/crt0.rel platform-micropack/commonmem.rel diff --git a/Kernel/platform-micropack/kernel.def b/Kernel/platform-micropack/kernel.def index 8fe7a39d..11863f78 100644 --- a/Kernel/platform-micropack/kernel.def +++ b/Kernel/platform-micropack/kernel.def @@ -1,6 +1,6 @@ ; UZI mnemonics for memory addresses etc -U_DATA .equ 0x7D00 ; (this is struct u_data from kernel.h) +U_DATA .equ 0x6000 ; (this is struct u_data from kernel.h) U_DATA__TOTALSIZE .equ 0x300 ; 256+256+256 bytes. Z80_TYPE .equ 0 -- 2.34.1