From f4b6c7637dd6940c5be5ef6d42be394f37d028ac Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Sun, 6 Oct 2019 14:32:23 -0400 Subject: [PATCH] zasm: rename #inc to .inc scas, it's not needed any more. --- apps/at28w/glue.asm | 6 +++--- apps/ed/glue.asm | 16 ++++++++-------- apps/memt/glue.asm | 4 ++-- apps/sdct/glue.asm | 4 ++-- apps/zasm/README.md | 6 +++--- apps/zasm/directive.asm | 2 +- apps/zasm/glue.asm | 28 ++++++++++++++-------------- kernel/shell.asm | 2 +- recipes/rc2014/eeprom/glue.asm | 20 ++++++++++---------- recipes/rc2014/glue.asm | 12 ++++++------ recipes/rc2014/ps2/glue.asm | 14 +++++++------- recipes/rc2014/sdcard/glue.asm | 24 ++++++++++++------------ recipes/rc2014/zasm/cfsin/hello.asm | 2 +- recipes/rc2014/zasm/glue.asm | 26 +++++++++++++------------- recipes/sms/glue.asm | 14 +++++++------- recipes/sms/kbd/glue.asm | 16 ++++++++-------- recipes/sms/romasm/glue.asm | 28 ++++++++++++++-------------- tools/emul/cfsin/hello.asm | 2 +- tools/emul/shell/shell_.asm | 22 +++++++++++----------- tools/emul/zasm/glue.asm | 12 ++++++------ tools/emul/zasm/zasm.bin | Bin 4673 -> 4673 bytes tools/tests/unit/test_core.asm | 2 +- tools/tests/unit/test_expr.asm | 18 +++++++++--------- tools/tests/unit/test_parse.asm | 4 ++-- tools/tests/unit/test_parse_z.asm | 12 ++++++------ tools/tests/unit/test_symbol.asm | 10 +++++----- tools/tests/unit/test_util_z.asm | 6 +++--- tools/tests/zasm/errtests.sh | 6 +++--- 28 files changed, 159 insertions(+), 159 deletions(-) diff --git a/apps/at28w/glue.asm b/apps/at28w/glue.asm index e1ee260..4746257 100644 --- a/apps/at28w/glue.asm +++ b/apps/at28w/glue.asm @@ -14,11 +14,11 @@ ; ; *** Includes *** -#include "user.h" -#include "err.h" +.inc "user.h" +.inc "err.h" .org USER_CODE .equ AT28W_RAMSTART USER_RAMSTART jp at28wMain -#include "at28w/main.asm" +.inc "at28w/main.asm" diff --git a/apps/ed/glue.asm b/apps/ed/glue.asm index 5956aed..7081026 100644 --- a/apps/ed/glue.asm +++ b/apps/ed/glue.asm @@ -1,4 +1,4 @@ -#include "user.h" +.inc "user.h" ; *** Overridable consts *** ; Maximum number of lines allowed in the buffer. @@ -8,18 +8,18 @@ ; ****** -#include "err.h" +.inc "err.h" .org USER_CODE jp edMain -#include "lib/util.asm" -#include "lib/parse.asm" +.inc "lib/util.asm" +.inc "lib/parse.asm" .equ IO_RAMSTART USER_RAMSTART -#include "ed/io.asm" +.inc "ed/io.asm" .equ BUF_RAMSTART IO_RAMEND -#include "ed/buf.asm" +.inc "ed/buf.asm" .equ CMD_RAMSTART BUF_RAMEND -#include "ed/cmd.asm" +.inc "ed/cmd.asm" .equ ED_RAMSTART CMD_RAMEND -#include "ed/main.asm" +.inc "ed/main.asm" diff --git a/apps/memt/glue.asm b/apps/memt/glue.asm index ec1f1f0..38a5495 100644 --- a/apps/memt/glue.asm +++ b/apps/memt/glue.asm @@ -12,9 +12,9 @@ ; ; *** Includes *** -#include "user.h" +.inc "user.h" .org USER_CODE jp memtMain -#include "memt/main.asm" +.inc "memt/main.asm" diff --git a/apps/sdct/glue.asm b/apps/sdct/glue.asm index dda3cf7..0588f71 100644 --- a/apps/sdct/glue.asm +++ b/apps/sdct/glue.asm @@ -18,10 +18,10 @@ ; ; *** Includes *** -#include "user.h" +.inc "user.h" .org USER_CODE .equ SDCT_RAMSTART USER_RAMSTART jp sdctMain -#include "sdct/main.asm" +.inc "sdct/main.asm" diff --git a/apps/zasm/README.md b/apps/zasm/README.md index 3a3cb08..afb0815 100644 --- a/apps/zasm/README.md +++ b/apps/zasm/README.md @@ -99,7 +99,7 @@ is very useful for variable definitions and for jump tables. ## Includes -The `#inc` directive is special. It takes a string literal as an argument and +The `.inc` directive is special. It takes a string literal as an argument and opens, in the currently active filesystem, the file with the specified name. It then proceeds to parse that file as if its content had been copy/pasted in @@ -108,7 +108,7 @@ elsewhere. Constants too. An exception is local labels: a local namespace always ends at the end of an included file. There an important limitation with includes: only one level of includes is -allowed. An included file cannot have an `#inc` directive. +allowed. An included file cannot have an `.inc` directive. ## Directives @@ -143,7 +143,7 @@ allowed. An included file cannot have an `#inc` directive. RAM constants, etc. The value is only outputted during the second pass. -**#inc**: Takes a string literal as an argument. Open the file name specified +**.inc**: Takes a string literal as an argument. Open the file name specified in the argument in the currently active filesystem, parse that file and output its binary content as is the code has been in the includer file. diff --git a/apps/zasm/directive.asm b/apps/zasm/directive.asm index 4150990..d317d88 100644 --- a/apps/zasm/directive.asm +++ b/apps/zasm/directive.asm @@ -25,7 +25,7 @@ directiveNames: .db ".ORG" .db ".FIL" .db ".OUT" - .db "#inc" + .db ".INC" .db ".BIN" ; This is a list of handlers corresponding to indexes in directiveNames diff --git a/apps/zasm/glue.asm b/apps/zasm/glue.asm index 0171de3..d20f38b 100644 --- a/apps/zasm/glue.asm +++ b/apps/zasm/glue.asm @@ -44,7 +44,7 @@ ; FS_HANDLE_SIZE ; BLOCKDEV_SIZE -#include "user.h" +.inc "user.h" ; *** Overridable consts *** ; Maximum number of symbols we can have in the global and consts registry @@ -63,26 +63,26 @@ ; ****** -#include "err.h" +.inc "err.h" .org USER_CODE jp zasmMain -#include "zasm/const.asm" -#include "lib/util.asm" -#include "zasm/util.asm" +.inc "zasm/const.asm" +.inc "lib/util.asm" +.inc "zasm/util.asm" .equ IO_RAMSTART USER_RAMSTART -#include "zasm/io.asm" +.inc "zasm/io.asm" .equ TOK_RAMSTART IO_RAMEND -#include "zasm/tok.asm" -#include "lib/parse.asm" +.inc "zasm/tok.asm" +.inc "lib/parse.asm" .equ INS_RAMSTART TOK_RAMEND -#include "zasm/instr.asm" +.inc "zasm/instr.asm" .equ DIREC_RAMSTART INS_RAMEND -#include "zasm/directive.asm" -#include "zasm/parse.asm" -#include "zasm/expr.asm" +.inc "zasm/directive.asm" +.inc "zasm/parse.asm" +.inc "zasm/expr.asm" .equ SYM_RAMSTART DIREC_RAMEND -#include "zasm/symbol.asm" +.inc "zasm/symbol.asm" .equ ZASM_RAMSTART SYM_RAMEND -#include "zasm/main.asm" +.inc "zasm/main.asm" diff --git a/kernel/shell.asm b/kernel/shell.asm index ca99de4..d46e465 100644 --- a/kernel/shell.asm +++ b/kernel/shell.asm @@ -217,7 +217,7 @@ shellPrintErr: ; Extra commands: Other parts might define new commands. You can add these ; commands to your shell. First, set SHELL_EXTRA_CMD_COUNT to ; the number of extra commands to add, then add a ".dw" -; directive *just* after your '#include "shell.asm"'. Voila! +; directive *just* after your '.inc "shell.asm"'. Voila! ; ; Set memory pointer to the specified address (word). diff --git a/recipes/rc2014/eeprom/glue.asm b/recipes/rc2014/eeprom/glue.asm index 5c4412d..f21d754 100644 --- a/recipes/rc2014/eeprom/glue.asm +++ b/recipes/rc2014/eeprom/glue.asm @@ -11,35 +11,35 @@ jp init .fill 0x38-$ jp aciaInt -#include "err.h" -#include "core.asm" -#include "parse.asm" +.inc "err.h" +.inc "core.asm" +.inc "parse.asm" .equ ACIA_RAMSTART RAMSTART -#include "acia.asm" +.inc "acia.asm" .equ MMAP_START 0xd000 -#include "mmap.asm" +.inc "mmap.asm" .equ BLOCKDEV_RAMSTART ACIA_RAMEND .equ BLOCKDEV_COUNT 1 -#include "blockdev.asm" +.inc "blockdev.asm" ; List of devices .dw mmapGetC, mmapPutC .equ STDIO_RAMSTART BLOCKDEV_RAMEND -#include "stdio.asm" +.inc "stdio.asm" .equ AT28W_RAMSTART STDIO_RAMEND -#include "at28w/main.asm" +.inc "at28w/main.asm" .equ SHELL_RAMSTART AT28W_RAMEND .equ SHELL_EXTRA_CMD_COUNT 5 -#include "shell.asm" +.inc "shell.asm" ; Extra cmds .dw a28wCmd .dw blkBselCmd, blkSeekCmd, blkLoadCmd, blkSaveCmd -#include "blockdev_cmds.asm" +.inc "blockdev_cmds.asm" init: di diff --git a/recipes/rc2014/glue.asm b/recipes/rc2014/glue.asm index fd3fe08..39e6fe2 100644 --- a/recipes/rc2014/glue.asm +++ b/recipes/rc2014/glue.asm @@ -11,18 +11,18 @@ jp init .fill 0x38-$ jp aciaInt -#include "err.h" -#include "core.asm" -#include "parse.asm" +.inc "err.h" +.inc "core.asm" +.inc "parse.asm" .equ ACIA_RAMSTART RAMSTART -#include "acia.asm" +.inc "acia.asm" .equ STDIO_RAMSTART ACIA_RAMEND -#include "stdio.asm" +.inc "stdio.asm" .equ SHELL_RAMSTART STDIO_RAMEND .equ SHELL_EXTRA_CMD_COUNT 0 -#include "shell.asm" +.inc "shell.asm" init: di diff --git a/recipes/rc2014/ps2/glue.asm b/recipes/rc2014/ps2/glue.asm index b36db91..926e323 100644 --- a/recipes/rc2014/ps2/glue.asm +++ b/recipes/rc2014/ps2/glue.asm @@ -6,21 +6,21 @@ jp init -#include "err.h" -#include "core.asm" -#include "parse.asm" +.inc "err.h" +.inc "core.asm" +.inc "parse.asm" .equ ACIA_RAMSTART RAMSTART -#include "acia.asm" +.inc "acia.asm" .equ KBD_RAMSTART ACIA_RAMEND -#include "kbd.asm" +.inc "kbd.asm" .equ STDIO_RAMSTART KBD_RAMEND -#include "stdio.asm" +.inc "stdio.asm" .equ SHELL_RAMSTART STDIO_RAMEND .equ SHELL_EXTRA_CMD_COUNT 0 -#include "shell.asm" +.inc "shell.asm" init: di diff --git a/recipes/rc2014/sdcard/glue.asm b/recipes/rc2014/sdcard/glue.asm index 4e0cad3..9212c5a 100644 --- a/recipes/rc2014/sdcard/glue.asm +++ b/recipes/rc2014/sdcard/glue.asm @@ -20,44 +20,44 @@ jp sdcSendRecv .fill 0x38-$ jp aciaInt -#include "err.h" -#include "core.asm" -#include "parse.asm" +.inc "err.h" +.inc "core.asm" +.inc "parse.asm" .equ ACIA_RAMSTART RAMSTART -#include "acia.asm" +.inc "acia.asm" .equ BLOCKDEV_RAMSTART ACIA_RAMEND .equ BLOCKDEV_COUNT 2 -#include "blockdev.asm" +.inc "blockdev.asm" ; List of devices .dw sdcGetC, sdcPutC .dw blk2GetC, blk2PutC .equ STDIO_RAMSTART BLOCKDEV_RAMEND -#include "stdio.asm" +.inc "stdio.asm" .equ FS_RAMSTART STDIO_RAMEND .equ FS_HANDLE_COUNT 1 -#include "fs.asm" +.inc "fs.asm" .equ SHELL_RAMSTART FS_RAMEND .equ SHELL_EXTRA_CMD_COUNT 11 -#include "shell.asm" +.inc "shell.asm" .dw sdcInitializeCmd, sdcFlushCmd .dw blkBselCmd, blkSeekCmd, blkLoadCmd, blkSaveCmd .dw fsOnCmd, flsCmd, fnewCmd, fdelCmd, fopnCmd -#include "blockdev_cmds.asm" -#include "fs_cmds.asm" +.inc "blockdev_cmds.asm" +.inc "fs_cmds.asm" .equ PGM_RAMSTART SHELL_RAMEND -#include "pgm.asm" +.inc "pgm.asm" .equ SDC_RAMSTART PGM_RAMEND .equ SDC_PORT_CSHIGH 6 .equ SDC_PORT_CSLOW 5 .equ SDC_PORT_SPI 4 -#include "sdc.asm" +.inc "sdc.asm" init: di diff --git a/recipes/rc2014/zasm/cfsin/hello.asm b/recipes/rc2014/zasm/cfsin/hello.asm index 8674de9..e342bc7 100644 --- a/recipes/rc2014/zasm/cfsin/hello.asm +++ b/recipes/rc2014/zasm/cfsin/hello.asm @@ -1,4 +1,4 @@ -#include "user.h" +.inc "user.h" .org USER_CODE ld hl, sAwesome diff --git a/recipes/rc2014/zasm/glue.asm b/recipes/rc2014/zasm/glue.asm index cb630d4..4c15cbb 100644 --- a/recipes/rc2014/zasm/glue.asm +++ b/recipes/rc2014/zasm/glue.asm @@ -46,14 +46,14 @@ jp aciaInt jp sdcPutC jp blkGetC -#include "err.h" -#include "core.asm" -#include "parse.asm" +.inc "err.h" +.inc "core.asm" +.inc "parse.asm" .equ ACIA_RAMSTART RAMSTART -#include "acia.asm" +.inc "acia.asm" .equ BLOCKDEV_RAMSTART ACIA_RAMEND .equ BLOCKDEV_COUNT 4 -#include "blockdev.asm" +.inc "blockdev.asm" ; List of devices .dw sdcGetC, sdcPutC .dw blk1GetC, blk1PutC @@ -62,33 +62,33 @@ jp aciaInt .equ MMAP_START 0xe000 -#include "mmap.asm" +.inc "mmap.asm" .equ STDIO_RAMSTART BLOCKDEV_RAMEND -#include "stdio.asm" +.inc "stdio.asm" .equ FS_RAMSTART STDIO_RAMEND .equ FS_HANDLE_COUNT 2 -#include "fs.asm" +.inc "fs.asm" .equ SHELL_RAMSTART FS_RAMEND .equ SHELL_EXTRA_CMD_COUNT 11 -#include "shell.asm" +.inc "shell.asm" .dw sdcInitializeCmd, sdcFlushCmd .dw blkBselCmd, blkSeekCmd, blkLoadCmd, blkSaveCmd .dw fsOnCmd, flsCmd, fnewCmd, fdelCmd, fopnCmd -#include "fs_cmds.asm" -#include "blockdev_cmds.asm" +.inc "fs_cmds.asm" +.inc "blockdev_cmds.asm" .equ PGM_RAMSTART SHELL_RAMEND -#include "pgm.asm" +.inc "pgm.asm" .equ SDC_RAMSTART PGM_RAMEND .equ SDC_PORT_CSHIGH 6 .equ SDC_PORT_CSLOW 5 .equ SDC_PORT_SPI 4 -#include "sdc.asm" +.inc "sdc.asm" .out SDC_RAMEND diff --git a/recipes/sms/glue.asm b/recipes/sms/glue.asm index 49965cf..d56c0b6 100644 --- a/recipes/sms/glue.asm +++ b/recipes/sms/glue.asm @@ -8,22 +8,22 @@ .fill 0x66-$ retn -#include "err.h" -#include "core.asm" -#include "parse.asm" +.inc "err.h" +.inc "core.asm" +.inc "parse.asm" .equ PAD_RAMSTART RAMSTART -#include "sms/pad.asm" +.inc "sms/pad.asm" .equ VDP_RAMSTART PAD_RAMEND -#include "sms/vdp.asm" +.inc "sms/vdp.asm" .equ STDIO_RAMSTART VDP_RAMEND -#include "stdio.asm" +.inc "stdio.asm" .equ SHELL_RAMSTART STDIO_RAMEND .equ SHELL_EXTRA_CMD_COUNT 0 -#include "shell.asm" +.inc "shell.asm" init: di diff --git a/recipes/sms/kbd/glue.asm b/recipes/sms/kbd/glue.asm index dcd403d..6cfa426 100644 --- a/recipes/sms/kbd/glue.asm +++ b/recipes/sms/kbd/glue.asm @@ -8,24 +8,24 @@ .fill 0x66-$ retn -#include "err.h" -#include "core.asm" -#include "parse.asm" +.inc "err.h" +.inc "core.asm" +.inc "parse.asm" -#include "sms/kbd.asm" +.inc "sms/kbd.asm" .equ KBD_RAMSTART RAMSTART .equ KBD_FETCHKC smskbdFetchKCB -#include "kbd.asm" +.inc "kbd.asm" .equ VDP_RAMSTART KBD_RAMEND -#include "sms/vdp.asm" +.inc "sms/vdp.asm" .equ STDIO_RAMSTART VDP_RAMEND -#include "stdio.asm" +.inc "stdio.asm" .equ SHELL_RAMSTART STDIO_RAMEND .equ SHELL_EXTRA_CMD_COUNT 0 -#include "shell.asm" +.inc "shell.asm" init: di diff --git a/recipes/sms/romasm/glue.asm b/recipes/sms/romasm/glue.asm index 4352aaa..a304c59 100644 --- a/recipes/sms/romasm/glue.asm +++ b/recipes/sms/romasm/glue.asm @@ -39,29 +39,29 @@ .fill 0x66-$ retn -#include "err.h" -#include "core.asm" -#include "parse.asm" +.inc "err.h" +.inc "core.asm" +.inc "parse.asm" -#include "sms/kbd.asm" +.inc "sms/kbd.asm" .equ KBD_RAMSTART RAMSTART .equ KBD_FETCHKC smskbdFetchKCB -#include "kbd.asm" +.inc "kbd.asm" .equ VDP_RAMSTART KBD_RAMEND -#include "sms/vdp.asm" +.inc "sms/vdp.asm" .equ STDIO_RAMSTART VDP_RAMEND -#include "stdio.asm" +.inc "stdio.asm" .equ MMAP_START 0xd700 ; 0x180 is to leave some space for the stack .equ MMAP_LEN RAMEND-MMAP_START-0x180 -#include "mmap.asm" +.inc "mmap.asm" .equ BLOCKDEV_RAMSTART STDIO_RAMEND .equ BLOCKDEV_COUNT 3 -#include "blockdev.asm" +.inc "blockdev.asm" ; List of devices .dw mmapGetC, mmapPutC .dw f0GetC, f0PutC @@ -70,20 +70,20 @@ .equ FS_RAMSTART BLOCKDEV_RAMEND .equ FS_HANDLE_COUNT 2 -#include "fs.asm" +.inc "fs.asm" .equ SHELL_RAMSTART FS_RAMEND .equ SHELL_EXTRA_CMD_COUNT 10 -#include "shell.asm" +.inc "shell.asm" .dw edCmd, zasmCmd, fnewCmd, fdelCmd, fopnCmd, flsCmd, blkBselCmd .dw blkSeekCmd, blkLoadCmd, blkSaveCmd -#include "blockdev_cmds.asm" -#include "fs_cmds.asm" +.inc "blockdev_cmds.asm" +.inc "fs_cmds.asm" .equ PGM_RAMSTART SHELL_RAMEND .equ PGM_CODEADDR USER_RAMSTART -#include "pgm.asm" +.inc "pgm.asm" .out PGM_RAMEND diff --git a/tools/emul/cfsin/hello.asm b/tools/emul/cfsin/hello.asm index 1f41e92..4c13840 100644 --- a/tools/emul/cfsin/hello.asm +++ b/tools/emul/cfsin/hello.asm @@ -1,4 +1,4 @@ -#include "user.h" +.inc "user.h" .org USER_CODE ld hl, sAwesome diff --git a/tools/emul/shell/shell_.asm b/tools/emul/shell/shell_.asm index acc61c2..efa54b0 100644 --- a/tools/emul/shell/shell_.asm +++ b/tools/emul/shell/shell_.asm @@ -40,13 +40,13 @@ jp stdioPutC jp stdioReadLine -#include "core.asm" -#include "err.h" -#include "parse.asm" +.inc "core.asm" +.inc "err.h" +.inc "parse.asm" .equ BLOCKDEV_RAMSTART RAMSTART .equ BLOCKDEV_COUNT 4 -#include "blockdev.asm" +.inc "blockdev.asm" ; List of devices .dw fsdevGetC, fsdevPutC .dw stdoutGetC, stdoutPutC @@ -55,27 +55,27 @@ .equ MMAP_START 0xe000 -#include "mmap.asm" +.inc "mmap.asm" .equ STDIO_RAMSTART BLOCKDEV_RAMEND -#include "stdio.asm" +.inc "stdio.asm" .equ FS_RAMSTART STDIO_RAMEND .equ FS_HANDLE_COUNT 2 -#include "fs.asm" +.inc "fs.asm" .equ SHELL_RAMSTART FS_RAMEND .equ SHELL_EXTRA_CMD_COUNT 9 -#include "shell.asm" +.inc "shell.asm" .dw blkBselCmd, blkSeekCmd, blkLoadCmd, blkSaveCmd .dw fsOnCmd, flsCmd, fnewCmd, fdelCmd, fopnCmd -#include "blockdev_cmds.asm" -#include "fs_cmds.asm" +.inc "blockdev_cmds.asm" +.inc "fs_cmds.asm" .equ PGM_RAMSTART SHELL_RAMEND .equ PGM_CODEADDR USERCODE -#include "pgm.asm" +.inc "pgm.asm" ;.out PGM_RAMEND diff --git a/tools/emul/zasm/glue.asm b/tools/emul/zasm/glue.asm index bc631d9..fdcbf0b 100644 --- a/tools/emul/zasm/glue.asm +++ b/tools/emul/zasm/glue.asm @@ -33,23 +33,23 @@ jp _blkSeek jp _blkTell jp printstr -#include "core.asm" -#include "err.h" -#include "parse.asm" +.inc "core.asm" +.inc "err.h" +.inc "parse.asm" .equ BLOCKDEV_RAMSTART RAMSTART .equ BLOCKDEV_COUNT 3 -#include "blockdev.asm" +.inc "blockdev.asm" ; List of devices .dw emulGetC, unsetZ .dw unsetZ, emulPutC .dw fsdevGetC, fsdevPutC .equ STDIO_RAMSTART BLOCKDEV_RAMEND -#include "stdio.asm" +.inc "stdio.asm" .equ FS_RAMSTART STDIO_RAMEND .equ FS_HANDLE_COUNT 0 -#include "fs.asm" +.inc "fs.asm" init: di diff --git a/tools/emul/zasm/zasm.bin b/tools/emul/zasm/zasm.bin index e6cae9df4a498d091f37cc21859e68ea117974c7..9fbe82b8d4d4b9b1595efe8017ba4ef339bcb76d 100644 GIT binary patch delta 17 YcmX@8a!_T%FCG>>Pe13)|9G5P0YQBRk^lez delta 17 YcmX@8a!_T%FCG@<%)I2y|9G5P0Ykb5=Kufz diff --git a/tools/tests/unit/test_core.asm b/tools/tests/unit/test_core.asm index aea98ff..25eaa7f 100644 --- a/tools/tests/unit/test_core.asm +++ b/tools/tests/unit/test_core.asm @@ -1,6 +1,6 @@ jp test -#include "core.asm" +.inc "core.asm" testNum: .db 1 diff --git a/tools/tests/unit/test_expr.asm b/tools/tests/unit/test_expr.asm index c7e5971..65e05b5 100644 --- a/tools/tests/unit/test_expr.asm +++ b/tools/tests/unit/test_expr.asm @@ -9,16 +9,16 @@ jp test -#include "core.asm" -#include "parse.asm" -#include "lib/util.asm" -#include "zasm/util.asm" -#include "zasm/const.asm" -#include "lib/parse.asm" -#include "zasm/parse.asm" +.inc "core.asm" +.inc "parse.asm" +.inc "lib/util.asm" +.inc "zasm/util.asm" +.inc "zasm/const.asm" +.inc "lib/parse.asm" +.inc "zasm/parse.asm" .equ SYM_RAMSTART DIREC_LASTVAL+2 -#include "zasm/symbol.asm" -#include "zasm/expr.asm" +.inc "zasm/symbol.asm" +.inc "zasm/expr.asm" ; Pretend that we aren't in first pass zasmIsFirstPass: diff --git a/tools/tests/unit/test_parse.asm b/tools/tests/unit/test_parse.asm index fa12fee..26bc106 100644 --- a/tools/tests/unit/test_parse.asm +++ b/tools/tests/unit/test_parse.asm @@ -1,7 +1,7 @@ jp test -#include "core.asm" -#include "parse.asm" +.inc "core.asm" +.inc "parse.asm" zasmGetPC: ret diff --git a/tools/tests/unit/test_parse_z.asm b/tools/tests/unit/test_parse_z.asm index a4b2232..56c6ca3 100644 --- a/tools/tests/unit/test_parse_z.asm +++ b/tools/tests/unit/test_parse_z.asm @@ -4,12 +4,12 @@ jp test -#include "core.asm" -#include "parse.asm" -#include "lib/util.asm" -#include "zasm/util.asm" -#include "lib/parse.asm" -#include "zasm/parse.asm" +.inc "core.asm" +.inc "parse.asm" +.inc "lib/util.asm" +.inc "zasm/util.asm" +.inc "lib/parse.asm" +.inc "zasm/parse.asm" ; mocks. aren't used in tests zasmGetPC: diff --git a/tools/tests/unit/test_symbol.asm b/tools/tests/unit/test_symbol.asm index b19880b..37017ad 100644 --- a/tools/tests/unit/test_symbol.asm +++ b/tools/tests/unit/test_symbol.asm @@ -6,12 +6,12 @@ jp test -#include "core.asm" -#include "lib/util.asm" -#include "zasm/util.asm" -#include "zasm/const.asm" +.inc "core.asm" +.inc "lib/util.asm" +.inc "zasm/util.asm" +.inc "zasm/const.asm" .equ SYM_RAMSTART RAMSTART -#include "zasm/symbol.asm" +.inc "zasm/symbol.asm" testNum: .db 1 diff --git a/tools/tests/unit/test_util_z.asm b/tools/tests/unit/test_util_z.asm index 3aaad9b..be75210 100644 --- a/tools/tests/unit/test_util_z.asm +++ b/tools/tests/unit/test_util_z.asm @@ -1,8 +1,8 @@ jp test -#include "core.asm" -#include "parse.asm" -#include "zasm/util.asm" +.inc "core.asm" +.inc "parse.asm" +.inc "zasm/util.asm" testNum: .db 1 sFoo: .db "foo", 0 diff --git a/tools/tests/zasm/errtests.sh b/tools/tests/zasm/errtests.sh index dd4a76b..b4f34f4 100755 --- a/tools/tests/zasm/errtests.sh +++ b/tools/tests/zasm/errtests.sh @@ -50,10 +50,10 @@ chkerr ".equ" 19 chkerr ".equ foo" 19 chkerr ".org" 19 chkerr ".fill" 19 -chkerr "#inc" 19 -chkerr "#inc foo" 19 +chkerr ".inc" 19 +chkerr ".inc foo" 19 chkerr "ld a, 0x100" 20 chkerr ".db 0x100" 20 -chkerr "#inc \"doesnotexist\"" 21 +chkerr ".inc \"doesnotexist\"" 21 chkerr "foo:\\foo:" 22 chkoom