From a2c85b757788bec2aff14c60d507ab7cbd996643 Mon Sep 17 00:00:00 2001 From: Lephe Date: Mon, 25 Nov 2024 17:29:48 +0100 Subject: [PATCH] kernel: partial support for Math+ OS 1.00 --- src/kernel/exch.c | 2 + src/kernel/hardware.c | 1 + src/kernel/kernel.c | 11 +++++- src/kernel/osmenu.c | 4 -- src/kernel/syscalls.S | 85 +++++++++++++++++++++++++++---------------- 5 files changed, 65 insertions(+), 38 deletions(-) diff --git a/src/kernel/exch.c b/src/kernel/exch.c index b1c11e9..f04bfb0 100644 --- a/src/kernel/exch.c +++ b/src/kernel/exch.c @@ -80,6 +80,7 @@ GNORETURN static void gint_default_panic(GUNUSED uint32_t code) if(code == 0x1060) name = "Memory init failed"; if(code == 0x1080) name = "Stack overflow"; if(code == 0x10a0) name = "UBC in bank 1 code"; + // if(code == 0x10c0) name = "Missing syscall"; // not on FX if(name[0]) dtext(1, 9, name); else dprint(1, 9, "%03x", code); @@ -121,6 +122,7 @@ GNORETURN static void gint_default_panic(GUNUSED uint32_t code) if(code == 0x1060) name = "Memory initialization failed (heap)"; if(code == 0x1080) name = "Stack overflow during world switch"; if(code == 0x10a0) name = "UBC break in register bank 1 code"; + if(code == 0x10c0) name = "Missing syscall for this OS version"; dprint(6, 25, "%03x %s", code, name); diff --git a/src/kernel/hardware.c b/src/kernel/hardware.c index 56e9dcb..8a02815 100644 --- a/src/kernel/hardware.c +++ b/src/kernel/hardware.c @@ -11,6 +11,7 @@ #include #include +#include "kernel.h" /* Holds information about the current platform */ GBSS uint32_t gint[HW_KEYS]; diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index d629735..c797ef5 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -40,8 +40,15 @@ void *gint_stack_top = NULL; /* kinit(): Install and start gint */ void kinit(void) { - /* Figure out which CASIOWIN API to use based on the OS type. */ - gint_set_CASIOWIN_API(0); + /* Figure out which CASIOWIN API to use based on the OS type. */ + #if GINT_OS_CG + char *version = (void *)0x80020020; + if(!memcmp(version, "01.00", 5)) + gint_set_CASIOWIN_API(1); + else + gint_set_CASIOWIN_API(0); + #endif + #if GINT_HW_FX /* On fx-9860G, VBR is loaded at the end of the user RAM. On SH4, the diff --git a/src/kernel/osmenu.c b/src/kernel/osmenu.c index 22afa1a..c5173c0 100644 --- a/src/kernel/osmenu.c +++ b/src/kernel/osmenu.c @@ -13,7 +13,6 @@ int __Timer_Deinstall(int id); int __PutKeyCode(int row, int column, int keycode); int __GetKeyWait(int *col,int *row,int type,int time,int menu,uint16_t *key); void __ClearKeyBuffer(void); /* ? */ -void __ConfigureStatusArea(int mode); void __SetQuitHandler(void (*callback)(void)); #if !GINT_OS_CP @@ -102,9 +101,6 @@ void gint_osmenu_native(void) gint_copy_vram(); #if GINT_OS_CG - /* Unfortunately ineffective (main menu probably reenables it) - __ConfigureStatusArea(3); */ - /* Try to use the internal function directly if we could figure out its address by dynamically disassembling */ os_menu_function_t *fun = find_os_menu_function(); diff --git a/src/kernel/syscalls.S b/src/kernel/syscalls.S index 4c819c7..a13f2b6 100644 --- a/src/kernel/syscalls.S +++ b/src/kernel/syscalls.S @@ -146,70 +146,91 @@ syscall_table: #if GINT_OS_CG #define CASIOWIN_API_VERSIONS 2 .global _gint_set_CASIOWIN_API +.global _gint_get_CASIOWIN_API /* System for dynamically selecting between the syscall and fixed version of each function based on the OS version. @r0: Internal function ID (from table below) */ _CASIOWIN_call: - mov #(4*CASIOWIN_API_VERSIONS), r1 + mov #CASIOWIN_API_VERSIONS, r1 mulu.w r0, r1 mov.l 3f, r0 mov.l @r0, r2 sts macl, r1 + add r2, r1 + shll2 r1 /* API version 0 is the normal syscall table */ tst r2, r2 mova .CASIOWIN_TABLE, r0 - bt.s 1f + bt.s .syscall mov.l @(r0, r1), r0 /* Other API versions are the direct calls */ + tst r0, r0 + bt .missingCall + jmp @r0 nop -1: mov.l 2f, r1 +.missingCall: + mov.l .gint_panic, r0 + mov.w 2f, r4 + jmp @r0 + nop + +.syscall: + mov.l 1f, r1 jmp @r1 nop -2: .long 0x80020070 +2: .word 0x10c0 +.balign 4 +1: .long 0x80020070 +.gint_panic: + .long _gint_panic _gint_set_CASIOWIN_API: mov.l 3f, r0 rts mov.l r4, @r0 +_gint_get_CASIOWIN_API: + mov.l 3f, r0 + rts + mov.l @r0, r0 + .balign 4 3: .long .CASIOWIN_API .CASIOWIN_TABLE: - .long 0x1f44, 0x00000000 /* malloc */ - .long 0x1f42, 0x00000000 /* free */ - .long 0x1f46, 0x00000000 /* realloc */ - .long 0x1db4, 0x00000000 /* BFile_Remove */ - .long 0x1db3, 0x00000000 /* BFile_Rename */ - .long 0x1dae, 0x00000000 /* BFile_Create */ - .long 0x1da3, 0x00000000 /* BFile_Open */ - .long 0x1da4, 0x00000000 /* BFile_Close */ - .long 0x1da6, 0x00000000 /* BFile_Size */ - .long 0x1da9, 0x00000000 /* BFile_Seek */ - .long 0x1dab, 0x00000000 /* BFile_GetPos */ - .long 0x1daf, 0x00000000 /* BFile_Write */ - .long 0x1dac, 0x00000000 /* BFile_Read */ - .long 0x1db6, 0x00000000 /* BFile_FindFirst */ - .long 0x1db8, 0x00000000 /* BFile_FindNext */ - .long 0x1dba, 0x00000000 /* BFile_FindClose */ - .long 0x08d9, 0x00000000 /* Timer_Install */ - .long 0x08db, 0x00000000 /* Timer_Start */ - .long 0x08dc, 0x00000000 /* Timer_Stop */ - .long 0x08da, 0x00000000 /* Timer_Deinstall */ - .long 0x12c6, 0x00000000 /* PutKeyCode */ - .long 0x12bf, 0x00000000 /* GetKeyWait */ - .long 0x12c7, 0x00000000 /* ClearKeyBuffer */ - .long 0x01e6, 0x00000000 /* GetVRAMAddress */ - .long 0x02b7, 0x00000000 /* ConfigureStatusArea */ - .long 0x1e6e, 0x00000000 /* SetQuitHandler */ - .long 0x1839, 0x00000000 /* PowerOff */ - .long 0x1187, 0x00000000 /* Reset */ + .long 0x1f44, 0x8025e0fc /* malloc */ + .long 0x1f42, 0x8025dec8 /* free */ + .long 0x1f46, 0x8025ec3c /* realloc */ + .long 0x1db4, 0x802404d2 /* BFile_Remove */ + .long 0x1db3, 0x80240482 /* BFile_Rename */ + .long 0x1dae, 0x802401b0 /* BFile_Create */ + .long 0x1da3, 0x8023fb90 /* BFile_Open */ + .long 0x1da4, 0x8023fd0e /* BFile_Close */ + .long 0x1da6, 0x8023fdc4 /* BFile_Size */ + .long 0x1da9, 0x8023ff2c /* BFile_Seek */ + .long 0x1dab, 0x8024003c /* BFile_GetPos */ + .long 0x1daf, 0x8024025e /* BFile_Write */ + .long 0x1dac, 0x80240082 /* BFile_Read */ + .long 0x1db6, 0 /* BFile_FindFirst */ + .long 0x1db8, 0x80240b06 /* BFile_FindNext */ + .long 0x1dba, 0x80240c10 /* BFile_FindClose */ + .long 0x08d9, 0x800b130c /* Timer_Install */ + .long 0x08db, 0x800b1456 /* Timer_Start */ + .long 0x08dc, 0x800b14b2 /* Timer_Stop */ + .long 0x08da, 0x800b13d4 /* Timer_Deinstall */ + .long 0x12c6, 0 /* PutKeyCode */ + .long 0x12bf, 0x8017be56 /* GetKeyWait */ + .long 0x12c7, 0 /* ClearKeyBuffer */ + .long 0x01e6, 0 /* GetVRAMAddress */ + .long 0x1e6e, 0 /* SetQuitHandler */ + .long 0x1839, 0 /* PowerOff */ + .long 0x1187, 0 /* Reset */ #define casiowin_call(id) bra _CASIOWIN_call; mov id, r0