Merge branch 'v8_maintenance'

# Conflicts:
#	compiler/res/prog8lib/cx16/syslib.p8
This commit is contained in:
Irmen de Jong 2023-05-22 20:43:05 +02:00
commit 61df5b3060

View File

@ -70,8 +70,10 @@ asmsub RDTIM16() -> uword @AY {
; -- like RDTIM() but only returning the lower 16 bits in AY for convenience. Also avoids ram bank issue for irqs. ; -- like RDTIM() but only returning the lower 16 bits in AY for convenience. Also avoids ram bank issue for irqs.
%asm {{ %asm {{
phx phx
php
sei sei
jsr cbm.RDTIM jsr cbm.RDTIM
plp
cli cli
pha pha
txa txa
@ -924,6 +926,7 @@ asmsub set_rasterline(uword line @AY) {
asmsub wait(uword jiffies @AY) { asmsub wait(uword jiffies @AY) {
; --- wait approximately the given number of jiffies (1/60th seconds) (N or N+1) ; --- wait approximately the given number of jiffies (1/60th seconds) (N or N+1)
; note: the system irq handler has to be active for this to work as it depends on the system jiffy clock ; note: the system irq handler has to be active for this to work as it depends on the system jiffy clock
; note: this routine cannot be used from inside a irq handler
%asm {{ %asm {{
phx phx
sta P8ZP_SCRATCH_W1 sta P8ZP_SCRATCH_W1