@@ -134,18 +134,18 @@ stdioReadC: | |||||
; save char for later | ; save char for later | ||||
ex af, af' | ex af, af' | ||||
ld a, (STDIO_BUFIDX) | ld a, (STDIO_BUFIDX) | ||||
push hl ;<| | |||||
ld hl, STDIO_BUF ; | | |||||
; make HL point to dest spot | | |||||
call addHL ; | | |||||
; Write our char down | | |||||
ex af, af' ; | | |||||
ld (hl), a ; | | |||||
; follow up with a null char | | |||||
inc hl ; | | |||||
xor a ; | | |||||
ld (hl), a ; | | |||||
pop hl ;<| | |||||
push hl ; --> lvl 1 | |||||
ld hl, STDIO_BUF | |||||
; make HL point to dest spot | |||||
call addHL | |||||
; Write our char down | |||||
ex af, af' | |||||
ld (hl), a | |||||
; follow up with a null char | |||||
inc hl | |||||
xor a | |||||
ld (hl), a | |||||
pop hl ; <-- lvl 1 | |||||
; inc idx, which still is in AF' | ; inc idx, which still is in AF' | ||||
ex af, af' | ex af, af' | ||||
inc a | inc a | ||||
@@ -1,7 +1,6 @@ | |||||
#!/bin/sh | #!/bin/sh | ||||
set -e | set -e | ||||
set -o pipefail | |||||
BASE=../../.. | BASE=../../.. | ||||
TOOLS=../.. | TOOLS=../.. | ||||
@@ -3,8 +3,10 @@ jp test | |||||
#include "core.asm" | #include "core.asm" | ||||
#include "parse.asm" | #include "parse.asm" | ||||
#include "lib/util.asm" | |||||
#include "zasm/util.asm" | #include "zasm/util.asm" | ||||
#include "zasm/const.asm" | #include "zasm/const.asm" | ||||
#include "lib/parse.asm" | |||||
#include "zasm/parse.asm" | #include "zasm/parse.asm" | ||||
.equ SYM_RAMSTART RAMSTART | .equ SYM_RAMSTART RAMSTART | ||||
#include "zasm/symbol.asm" | #include "zasm/symbol.asm" | ||||
@@ -2,7 +2,9 @@ jp test | |||||
#include "core.asm" | #include "core.asm" | ||||
#include "parse.asm" | #include "parse.asm" | ||||
#include "lib/util.asm" | |||||
#include "zasm/util.asm" | #include "zasm/util.asm" | ||||
#include "lib/parse.asm" | |||||
#include "zasm/parse.asm" | #include "zasm/parse.asm" | ||||
; mocks. aren't used in tests | ; mocks. aren't used in tests | ||||
@@ -2,6 +2,7 @@ | |||||
jp test | jp test | ||||
#include "core.asm" | #include "core.asm" | ||||
#include "lib/util.asm" | |||||
#include "zasm/util.asm" | #include "zasm/util.asm" | ||||
#include "zasm/const.asm" | #include "zasm/const.asm" | ||||
.equ SYM_RAMSTART RAMSTART | .equ SYM_RAMSTART RAMSTART | ||||
@@ -1,4 +1,4 @@ | |||||
#!/bin/sh | |||||
#!/usr/bin/env bash | |||||
# no "set -e" because we test errors | # no "set -e" because we test errors | ||||
@@ -1,4 +1,4 @@ | |||||
#!/usr/bin/python | |||||
#!/usr/bin/env python3 | |||||
# Generate almost all possible combination for instructions from instruction | # Generate almost all possible combination for instructions from instruction | ||||
# tables | # tables | ||||
@@ -30,11 +30,13 @@ | |||||
#include "err.h" | #include "err.h" | ||||
#include "zasm/const.asm" | #include "zasm/const.asm" | ||||
#include "lib/util.asm" | |||||
#include "zasm/util.asm" | #include "zasm/util.asm" | ||||
.equ IO_RAMSTART USER_RAMSTART | .equ IO_RAMSTART USER_RAMSTART | ||||
#include "zasm/io.asm" | #include "zasm/io.asm" | ||||
.equ SYM_RAMSTART IO_RAMEND | .equ SYM_RAMSTART IO_RAMEND | ||||
#include "zasm/symbol.asm" | #include "zasm/symbol.asm" | ||||
#include "lib/parse.asm" | |||||
#include "zasm/parse.asm" | #include "zasm/parse.asm" | ||||
.equ TOK_RAMSTART SYM_RAMEND | .equ TOK_RAMSTART SYM_RAMEND | ||||
#include "zasm/tok.asm" | #include "zasm/tok.asm" | ||||