From: Alan Cox Date: Sun, 27 Jan 2019 21:58:36 +0000 (+0000) Subject: udata: Fix the remaining legacy udata sizes X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=95f1005685bc7e9684b03206827acebf495af820;p=FUZIX.git udata: Fix the remaining legacy udata sizes In some cases this should also fix a few bugs --- diff --git a/Kernel/platform-appleiie/kernel.def b/Kernel/platform-appleiie/kernel.def index 61bfff4c..a27725bb 100644 --- a/Kernel/platform-appleiie/kernel.def +++ b/Kernel/platform-appleiie/kernel.def @@ -2,8 +2,8 @@ ; (this is struct u_data from kernel.h) U_DATA .set $0200 -; 256+256+256 bytes. -U_DATA__TOTALSIZE .set $300 +; 256+256 bytes. +U_DATA__TOTALSIZE .set $200 PROGLOAD .set $2000 ZPBASE .set $0 diff --git a/Kernel/platform-dragon/kernel.def b/Kernel/platform-dragon/kernel.def index c14daee9..6374e0e2 100644 --- a/Kernel/platform-dragon/kernel.def +++ b/Kernel/platform-dragon/kernel.def @@ -1,7 +1,7 @@ ; UZI mnemonics for memory addresses etc -U_DATA equ 0x7D00 ; (this is struct u_data from kernel.h) -U_DATA__TOTALSIZE equ 0x300 ; 256+256+256 bytes. +U_DATA equ 0x7E00 ; (this is struct u_data from kernel.h) +U_DATA__TOTALSIZE equ 0x0200 ; 256+256+256 bytes. SAM_USER macro diff --git a/Kernel/platform-micropack/kernel.def b/Kernel/platform-micropack/kernel.def index ab108d4c..41f169e1 100644 --- a/Kernel/platform-micropack/kernel.def +++ b/Kernel/platform-micropack/kernel.def @@ -1,7 +1,7 @@ ; UZI mnemonics for memory addresses etc U_DATA .equ 0x8200 ; (this is struct u_data from kernel.h) -U_DATA__TOTALSIZE .equ 0x300 ; 256+256+256 bytes. +U_DATA__TOTALSIZE .equ 0x200 ; 256+256+256 bytes. Z80_TYPE .equ 0 diff --git a/Kernel/platform-msx2/kernel.def b/Kernel/platform-msx2/kernel.def index cd4444a0..988b2b28 100644 --- a/Kernel/platform-msx2/kernel.def +++ b/Kernel/platform-msx2/kernel.def @@ -1,7 +1,7 @@ ; UZI mnemonics for memory addresses etc U_DATA .equ 0xF000 ; (this is struct u_data from kernel.h) -U_DATA__TOTALSIZE .equ 0x300 ; 256+256+256 bytes. +U_DATA__TOTALSIZE .equ 0x200 ; 256+256 bytes. ; as far as I can tell either is allowed by the spec diff --git a/Kernel/platform-mtx/config.h b/Kernel/platform-mtx/config.h index 6ce60493..5d9e88b5 100644 --- a/Kernel/platform-mtx/config.h +++ b/Kernel/platform-mtx/config.h @@ -29,7 +29,7 @@ #define TICKSPERSEC 50 /* Ticks per second */ #define PROGBASE 0x0000 /* also data base */ #define PROGLOAD 0x0100 /* also data base */ -#define PROGTOP 0xBD00 /* Top of program, base of U_DATA copy */ +#define PROGTOP 0xBE00 /* Top of program, base of U_DATA copy */ #define PROC_SIZE 48 /* Memory needed per process */ /* Undefine this section if you don't have a silicon disc for swap. It's not diff --git a/Kernel/platform-mtx/kernel.def b/Kernel/platform-mtx/kernel.def index 92367f44..2c111451 100644 --- a/Kernel/platform-mtx/kernel.def +++ b/Kernel/platform-mtx/kernel.def @@ -1,9 +1,9 @@ ; UZI mnemonics for memory addresses etc U_DATA .equ 0xF000 ; (this is struct u_data from kernel.h) -U_DATA__TOTALSIZE .equ 0x300 ; 256+256+256 bytes. +U_DATA__TOTALSIZE .equ 0x200 ; 256+256 bytes. -U_DATA_STASH .equ 0xBD00 ; BD00-BFFF +U_DATA_STASH .equ 0xBE00 ; BE00-BFFF PROGBASE .equ 0x0000 PROGLOAD .equ 0x0100 diff --git a/Kernel/platform-n8vem-mark4/kernel.def b/Kernel/platform-n8vem-mark4/kernel.def index c48fab53..ad26ba32 100644 --- a/Kernel/platform-n8vem-mark4/kernel.def +++ b/Kernel/platform-n8vem-mark4/kernel.def @@ -2,7 +2,7 @@ ; Move down to 0xF600 to fit the monitor in U_DATA .equ 0xF800 ; (this is struct u_data from kernel.h) -U_DATA__TOTALSIZE .equ 0x300 ; 256+256+256 bytes. +U_DATA__TOTALSIZE .equ 0x200 ; 256+256 bytes. Z80_TYPE .equ 2 OS_BANK .equ 0x00 ; value from include/kernel.h diff --git a/Kernel/platform-p112/kernel.def b/Kernel/platform-p112/kernel.def index dfcbfa63..7d15ed79 100644 --- a/Kernel/platform-p112/kernel.def +++ b/Kernel/platform-p112/kernel.def @@ -1,7 +1,7 @@ ; UZI mnemonics for memory addresses etc U_DATA .equ 0xF800 ; (this is struct u_data from kernel.h) -U_DATA__TOTALSIZE .equ 0x300 ; 256+256+256 bytes. +U_DATA__TOTALSIZE .equ 0x200 ; 256+256 bytes. OS_BANK .equ 0x00 ; value from include/kernel.h diff --git a/Kernel/platform-pcw8256/kernel.def b/Kernel/platform-pcw8256/kernel.def index 884b035f..c33b656d 100644 --- a/Kernel/platform-pcw8256/kernel.def +++ b/Kernel/platform-pcw8256/kernel.def @@ -1,7 +1,7 @@ ; UZI mnemonics for memory addresses etc U_DATA .equ 0xF400 ; (this is struct u_data from kernel.h) -U_DATA__TOTALSIZE .equ 0x300 ; 256+256+256 bytes. +U_DATA__TOTALSIZE .equ 0x200 ; 256+256 bytes. Z80_TYPE .equ 0 ; FIXME: check diff --git a/Kernel/platform-px4plus/kernel.def b/Kernel/platform-px4plus/kernel.def index bc16610d..10a5d139 100644 --- a/Kernel/platform-px4plus/kernel.def +++ b/Kernel/platform-px4plus/kernel.def @@ -1,7 +1,7 @@ ; UZI mnemonics for memory addresses etc U_DATA .equ 0x0100 ; (this is struct u_data from kernel.h) -U_DATA__TOTALSIZE .equ 0x300 ; 256+256+256 bytes. +U_DATA__TOTALSIZE .equ 0x200 ; 256+256+256 bytes. VIDBASE .equ 0xF8 ; Video for now diff --git a/Kernel/platform-rc2014-tiny/kernel.def b/Kernel/platform-rc2014-tiny/kernel.def index 7941c545..c971ef3d 100644 --- a/Kernel/platform-rc2014-tiny/kernel.def +++ b/Kernel/platform-rc2014-tiny/kernel.def @@ -1,7 +1,7 @@ ; FUZIX mnemonics for memory addresses etc U_DATA .equ 0xC000 ; (this is struct u_data from kernel.h) -U_DATA__TOTALSIZE .equ 0x300 ; 256+256+256 bytes. +U_DATA__TOTALSIZE .equ 0x200 ; 256+256 bytes. Z80_TYPE .equ 0 ; CMOS Z80_MMU_HOOKS .equ 0 diff --git a/Kernel/platform-rc2014/kernel.def b/Kernel/platform-rc2014/kernel.def index c0714fca..d0bc0db2 100644 --- a/Kernel/platform-rc2014/kernel.def +++ b/Kernel/platform-rc2014/kernel.def @@ -1,7 +1,7 @@ ; FUZIX mnemonics for memory addresses etc U_DATA .equ 0xD000 ; (this is struct u_data from kernel.h) -U_DATA__TOTALSIZE .equ 0x300 ; 256+256+256 bytes. +U_DATA__TOTALSIZE .equ 0x200 ; 256+256 bytes. Z80_TYPE .equ 0 ; just a old good Z80 USE_FANCY_MONITOR .equ 1 ; disabling this saves around approx 0.5KB diff --git a/Kernel/platform-socz80/kernel.def b/Kernel/platform-socz80/kernel.def index 36153720..e3c7b6d7 100644 --- a/Kernel/platform-socz80/kernel.def +++ b/Kernel/platform-socz80/kernel.def @@ -1,7 +1,7 @@ ; UZI mnemonics for memory addresses etc U_DATA .equ 0xf800 ; (this is struct u_data from kernel.h) -U_DATA__TOTALSIZE .equ 0x300 ; 256+256+256 bytes. +U_DATA__TOTALSIZE .equ 0x200 ; 256+256 bytes. Z80_TYPE .equ 0 ; Actually a T80 diff --git a/Kernel/platform-tgl6502/kernel.def b/Kernel/platform-tgl6502/kernel.def index 61bfff4c..c213cb7f 100644 --- a/Kernel/platform-tgl6502/kernel.def +++ b/Kernel/platform-tgl6502/kernel.def @@ -3,7 +3,7 @@ ; (this is struct u_data from kernel.h) U_DATA .set $0200 ; 256+256+256 bytes. -U_DATA__TOTALSIZE .set $300 +U_DATA__TOTALSIZE .set $200 PROGLOAD .set $2000 ZPBASE .set $0 diff --git a/Kernel/platform-ubee/config.h b/Kernel/platform-ubee/config.h index 8a81a90a..dc761df1 100644 --- a/Kernel/platform-ubee/config.h +++ b/Kernel/platform-ubee/config.h @@ -40,7 +40,7 @@ #define TICKSPERSEC 10 /* Ticks per second */ #define PROGBASE 0x0000 /* Base of user */ #define PROGLOAD 0x0100 /* Load and run here */ -#define PROGTOP 0x7D00 /* Top of program, base of U_DATA stash */ +#define PROGTOP 0x7E00 /* Top of program, base of U_DATA stash */ #define PROC_SIZE 32 /* Memory needed per process */ #define SWAPDEV (swap_dev) diff --git a/Kernel/platform-ubee/kernel.def b/Kernel/platform-ubee/kernel.def index d07a89f4..49a56f93 100644 --- a/Kernel/platform-ubee/kernel.def +++ b/Kernel/platform-ubee/kernel.def @@ -1,9 +1,9 @@ ; UZI mnemonics for memory addresses etc U_DATA .equ 0xF000 ; (this is struct u_data from kernel.h) -U_DATA__TOTALSIZE .equ 0x300 ; 256+256+256 bytes. +U_DATA__TOTALSIZE .equ 0x200 ; 256+256+256 bytes. -U_DATA_STASH .equ 0x7D00 ; BD00-BFFF +U_DATA_STASH .equ 0x7E00 ; 7E00-7FFF PROGBASE .equ 0x0000 PROGLOAD .equ 0x0100 diff --git a/Kernel/platform-v65/kernel.def b/Kernel/platform-v65/kernel.def index 61bfff4c..a27725bb 100644 --- a/Kernel/platform-v65/kernel.def +++ b/Kernel/platform-v65/kernel.def @@ -2,8 +2,8 @@ ; (this is struct u_data from kernel.h) U_DATA .set $0200 -; 256+256+256 bytes. -U_DATA__TOTALSIZE .set $300 +; 256+256 bytes. +U_DATA__TOTALSIZE .set $200 PROGLOAD .set $2000 ZPBASE .set $0 diff --git a/Kernel/platform-z80pack/config.h b/Kernel/platform-z80pack/config.h index aa5f3e27..38d2d4db 100644 --- a/Kernel/platform-z80pack/config.h +++ b/Kernel/platform-z80pack/config.h @@ -31,7 +31,7 @@ #define TICKSPERSEC 100 /* Ticks per second */ #define PROGBASE 0x0000 /* also data base */ #define PROGLOAD 0x0100 /* also data base */ -#define PROGTOP 0xED00 /* Top of program, base of U_DATA copy */ +#define PROGTOP 0xEE00 /* Top of program, base of U_DATA copy */ #define PROC_SIZE 60 /* Memory needed per process */ #define SWAP_SIZE 0x78 /* 60K in blocks (we actually don't need the low 256) */ diff --git a/Kernel/platform-z80pack/kernel.def b/Kernel/platform-z80pack/kernel.def index ea79959d..7cc78f7e 100644 --- a/Kernel/platform-z80pack/kernel.def +++ b/Kernel/platform-z80pack/kernel.def @@ -1,9 +1,9 @@ ; UZI mnemonics for memory addresses etc U_DATA .equ 0xF000 ; (this is struct u_data from kernel.h) -U_DATA__TOTALSIZE .equ 0x300 ; 256+256+256 bytes. +U_DATA__TOTALSIZE .equ 0x200 ; 256+256 bytes. -U_DATA_STASH .equ 0xED00 ; ED00-EFFF +U_DATA_STASH .equ 0xEE00 ; EE00-EFFF PROGBASE .equ 0x0000 PROGLOAD .equ 0x0100 diff --git a/Kernel/platform-z80pack32/kernel.def b/Kernel/platform-z80pack32/kernel.def index 668c489e..45171e3b 100644 --- a/Kernel/platform-z80pack32/kernel.def +++ b/Kernel/platform-z80pack32/kernel.def @@ -1,10 +1,10 @@ ; UZI mnemonics for memory addresses etc U_DATA .equ 0xF000 ; (this is struct u_data from kernel.h) -U_DATA__TOTALSIZE .equ 0x300 ; 256+256+256 bytes. +U_DATA__TOTALSIZE .equ 0x200 ; 256+256+256 bytes. -U_STASH_HIGH .equ 0xBD00 ; BD00-BFFF -U_STASH_LOW .equ 0x7D00 ; 7D00-BFFF +U_STASH_HIGH .equ 0xBE00 ; BE00-BFFF +U_STASH_LOW .equ 0x7E00 ; 7E00-BFFF Z80_TYPE .equ 0 diff --git a/Kernel/platform-zeta-v2/kernel.def b/Kernel/platform-zeta-v2/kernel.def index 43fe859c..c63ed2b8 100644 --- a/Kernel/platform-zeta-v2/kernel.def +++ b/Kernel/platform-zeta-v2/kernel.def @@ -1,7 +1,7 @@ ; FUZIX mnemonics for memory addresses etc U_DATA .equ 0xF000 ; (this is struct u_data from kernel.h) -U_DATA__TOTALSIZE .equ 0x300 ; 256+256+256 bytes. +U_DATA__TOTALSIZE .equ 0x200 ; 256+256+256 bytes. Z80_TYPE .equ 0 ; just an old good Z80 USE_FANCY_MONITOR .equ 1 ; disabling this saves around approx 0.5KB diff --git a/Kernel/platform-zx128/config.h b/Kernel/platform-zx128/config.h index 90470d8f..d32b73d0 100644 --- a/Kernel/platform-zx128/config.h +++ b/Kernel/platform-zx128/config.h @@ -42,7 +42,7 @@ #define TICKSPERSEC 50 /* Ticks per second */ #define PROGBASE 0x8000 /* also data base */ #define PROGLOAD 0x8000 /* also data base */ -#define PROGTOP 0xFC00 /* Top of program, base of U_DATA copy */ +#define PROGTOP 0xFD00 /* Top of program, base of U_DATA copy */ #define PROC_SIZE 32 /* Memory needed per process */ #define BOOT_TTY (513) /* Set this to default device for stdio, stderr */ diff --git a/Kernel/platform-zx128/kernel.def b/Kernel/platform-zx128/kernel.def index 2f6a24f6..9f291469 100644 --- a/Kernel/platform-zx128/kernel.def +++ b/Kernel/platform-zx128/kernel.def @@ -1,9 +1,9 @@ ; UZI mnemonics for memory addresses etc U_DATA .equ 0x4000 ; (this is struct u_data from kernel.h) -U_DATA__TOTALSIZE .equ 0x300 ; 256+256+256 bytes. +U_DATA__TOTALSIZE .equ 0x200 ; 256+256 bytes. -U_DATA_STASH .equ 0xFC00 ; FC00-FEFF +U_DATA_STASH .equ 0xFD00 ; FD00-FEFF Z80_TYPE .equ 1