From c53f18130098eb3dd3f6a584e977167015a01447 Mon Sep 17 00:00:00 2001 From: Jose Rodriguez Date: Thu, 29 Apr 2021 23:16:25 +0200 Subject: [PATCH 1/3] Undef ESXDOS labels --- src/arch/zx48k/library/esxdos.bas | 42 +++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/src/arch/zx48k/library/esxdos.bas b/src/arch/zx48k/library/esxdos.bas index 609d0c393..ddd659164 100644 --- a/src/arch/zx48k/library/esxdos.bas +++ b/src/arch/zx48k/library/esxdos.bas @@ -746,4 +746,46 @@ read_ok: End Asm End Sub + +' Remove macros +#undef HOOK_BASE +#undef MISC_BASE +#undef FSYS_BASE +#undef M_GETSETDRV +#undef F_OPEN +#undef F_CLOSE +#undef F_READ +#undef F_WRITE +#undef F_SEEK +#undef F_GETPOS +#undef F_OPENDIR +#undef F_READDIR +#undef F_TELLDIR +#undef F_SEEKDIR +#undef F_REWINDDIR +#undef F_GETCWD +#undef F_CHDIR +#undef F_MKDIR +#undef F_RMDIR + +#undef EDOS_FMODE_READ +#undef EDOS_FMODE_WRITE +#undef EDOS_FMODE_OPEN_EX +#undef EDOS_FMODE_OPEN_AL +#undef EDOS_FMODE_CREATE_NEW +#undef EDOS_FMODE_CREATE_AL + +#undef SEEK_START +#undef SEEK_CUR +#undef SEEK_BKCUR + +#undef FATTR_RDONLY +#undef FATTR_HIDDEN +#undef FATTR_SYSTEM +#undef FATTR_VOLUME +#undef FATTR_DIR +#undef FATTR_ARCHIVE + +#undef EDOS_ERR_NR + #endif From ba8ae33b4c7b254188f3c6b8f1d616489f901201 Mon Sep 17 00:00:00 2001 From: Jose Rodriguez Date: Sat, 1 May 2021 20:20:42 +0200 Subject: [PATCH 2/3] Make ESXDOS lib to use .core namespace --- src/arch/zx48k/library/esxdos.bas | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/arch/zx48k/library/esxdos.bas b/src/arch/zx48k/library/esxdos.bas index ddd659164..1229c0d84 100644 --- a/src/arch/zx48k/library/esxdos.bas +++ b/src/arch/zx48k/library/esxdos.bas @@ -262,6 +262,7 @@ Function ESXDosGetCwd as String Dim addr as Uinteger Asm + push namespace core proc local NotNull @@ -287,6 +288,7 @@ NotNull: db F_GETCWD pop ix endp + pop namespace End Asm cwd$ = "" @@ -324,6 +326,7 @@ Function ESXDosOpenDir (ByVal path as String) as UInteger end if Asm + push namespace core Proc local NotNull local HandleOK @@ -382,6 +385,7 @@ HandleOK: ExitFunction: endp + pop namespace End Asm return handle @@ -560,6 +564,7 @@ Sub ESXDosChDir (ByVal path as String) end if Asm + push namespace core Proc local NotNull local HandleOK @@ -603,6 +608,7 @@ HandleOK: pop hl call __MEM_FREE ;deallocate mem endp + pop namespace End Asm End Sub From dca7b766f61061604ce76993806906ed1ecfc69d Mon Sep 17 00:00:00 2001 From: Jose Rodriguez Date: Wed, 5 May 2021 22:57:37 +0200 Subject: [PATCH 3/3] Update esxdos.bas for zxnext --- src/arch/zxnext/library/esxdos.bas | 48 ++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/src/arch/zxnext/library/esxdos.bas b/src/arch/zxnext/library/esxdos.bas index 609d0c393..1229c0d84 100644 --- a/src/arch/zxnext/library/esxdos.bas +++ b/src/arch/zxnext/library/esxdos.bas @@ -262,6 +262,7 @@ Function ESXDosGetCwd as String Dim addr as Uinteger Asm + push namespace core proc local NotNull @@ -287,6 +288,7 @@ NotNull: db F_GETCWD pop ix endp + pop namespace End Asm cwd$ = "" @@ -324,6 +326,7 @@ Function ESXDosOpenDir (ByVal path as String) as UInteger end if Asm + push namespace core Proc local NotNull local HandleOK @@ -382,6 +385,7 @@ HandleOK: ExitFunction: endp + pop namespace End Asm return handle @@ -560,6 +564,7 @@ Sub ESXDosChDir (ByVal path as String) end if Asm + push namespace core Proc local NotNull local HandleOK @@ -603,6 +608,7 @@ HandleOK: pop hl call __MEM_FREE ;deallocate mem endp + pop namespace End Asm End Sub @@ -746,4 +752,46 @@ read_ok: End Asm End Sub + +' Remove macros +#undef HOOK_BASE +#undef MISC_BASE +#undef FSYS_BASE +#undef M_GETSETDRV +#undef F_OPEN +#undef F_CLOSE +#undef F_READ +#undef F_WRITE +#undef F_SEEK +#undef F_GETPOS +#undef F_OPENDIR +#undef F_READDIR +#undef F_TELLDIR +#undef F_SEEKDIR +#undef F_REWINDDIR +#undef F_GETCWD +#undef F_CHDIR +#undef F_MKDIR +#undef F_RMDIR + +#undef EDOS_FMODE_READ +#undef EDOS_FMODE_WRITE +#undef EDOS_FMODE_OPEN_EX +#undef EDOS_FMODE_OPEN_AL +#undef EDOS_FMODE_CREATE_NEW +#undef EDOS_FMODE_CREATE_AL + +#undef SEEK_START +#undef SEEK_CUR +#undef SEEK_BKCUR + +#undef FATTR_RDONLY +#undef FATTR_HIDDEN +#undef FATTR_SYSTEM +#undef FATTR_VOLUME +#undef FATTR_DIR +#undef FATTR_ARCHIVE + +#undef EDOS_ERR_NR + #endif