From 9a9eeec12929f0d5eaf4eaadd7dfc3c1eacaa7cd Mon Sep 17 00:00:00 2001 From: jespergravgaard Date: Sat, 11 Aug 2018 00:52:02 +0200 Subject: [PATCH] Fixed tests. --- .../camelot64/kickc/test/ref/irq-hardware.log | 12 +++++----- .../kickc/test/ref/irq-hyperscreen.log | 24 +++++++++---------- .../camelot64/kickc/test/ref/irq-kernel.log | 12 +++++----- .../camelot64/kickc/test/ref/irq-raster.log | 12 +++++----- .../test/ref/test-interrupt-volatile.log | 12 +++++----- .../kickc/test/ref/test-interrupt.log | 12 +++++----- 6 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/test/java/dk/camelot64/kickc/test/ref/irq-hardware.log b/src/test/java/dk/camelot64/kickc/test/ref/irq-hardware.log index 35539e4d4..2f1d245e6 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/irq-hardware.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/irq-hardware.log @@ -492,7 +492,7 @@ main: { } //SEG20 irq irq: { - //SEG21 interrupt HARDWARE_ALL + //SEG21 entry interrupt(HARDWARE_ALL) sta rega+1 stx regx+1 sty regy+1 @@ -508,7 +508,7 @@ irq: { jmp breturn //SEG25 irq::@return breturn: - //SEG26 [17] return [ ] ( ) + //SEG26 [17] return [ ] ( ) - exit interrupt(HARDWARE_ALL) rega: lda #00 regx: @@ -615,7 +615,7 @@ main: { } //SEG20 irq irq: { - //SEG21 interrupt HARDWARE_ALL + //SEG21 entry interrupt(HARDWARE_ALL) sta rega+1 stx regx+1 sty regy+1 @@ -631,7 +631,7 @@ irq: { jmp breturn //SEG25 irq::@return breturn: - //SEG26 [17] return [ ] ( ) + //SEG26 [17] return [ ] ( ) - exit interrupt(HARDWARE_ALL) rega: lda #00 regx: @@ -768,7 +768,7 @@ main: { } //SEG20 irq irq: { - //SEG21 interrupt HARDWARE_ALL + //SEG21 entry interrupt(HARDWARE_ALL) sta rega+1 stx regx+1 sty regy+1 @@ -782,7 +782,7 @@ irq: { lda #IRQ_RASTER sta IRQ_STATUS //SEG25 irq::@return - //SEG26 [17] return [ ] ( ) + //SEG26 [17] return [ ] ( ) - exit interrupt(HARDWARE_ALL) rega: lda #00 regx: diff --git a/src/test/java/dk/camelot64/kickc/test/ref/irq-hyperscreen.log b/src/test/java/dk/camelot64/kickc/test/ref/irq-hyperscreen.log index c0ff55300..c9637b4ee 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/irq-hyperscreen.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/irq-hyperscreen.log @@ -498,7 +498,7 @@ main: { } //SEG19 irq_bottom_2 irq_bottom_2: { - //SEG20 interrupt KERNEL_KEYBOARD + //SEG20 entry interrupt(KERNEL_KEYBOARD) //SEG21 [13] *((const byte*) FGCOL#0) ← (const byte) WHITE#0 [ ] ( ) -- _deref_pbuc1=vbuc2 lda #WHITE sta FGCOL @@ -523,12 +523,12 @@ irq_bottom_2: { jmp breturn //SEG27 irq_bottom_2::@return breturn: - //SEG28 [19] return [ ] ( ) + //SEG28 [19] return [ ] ( ) - exit interrupt(KERNEL_KEYBOARD) jmp $ea31 } //SEG29 irq_bottom_1 irq_bottom_1: { - //SEG30 interrupt KERNEL_MIN + //SEG30 entry interrupt(KERNEL_MIN) //SEG31 [20] *((const byte*) FGCOL#0) ← (const byte) WHITE#0 [ ] ( ) -- _deref_pbuc1=vbuc2 lda #WHITE sta FGCOL @@ -553,7 +553,7 @@ irq_bottom_1: { jmp breturn //SEG37 irq_bottom_1::@return breturn: - //SEG38 [26] return [ ] ( ) + //SEG38 [26] return [ ] ( ) - exit interrupt(KERNEL_MIN) jmp $ea81 } @@ -656,7 +656,7 @@ main: { } //SEG19 irq_bottom_2 irq_bottom_2: { - //SEG20 interrupt KERNEL_KEYBOARD + //SEG20 entry interrupt(KERNEL_KEYBOARD) //SEG21 [13] *((const byte*) FGCOL#0) ← (const byte) WHITE#0 [ ] ( ) -- _deref_pbuc1=vbuc2 lda #WHITE sta FGCOL @@ -681,12 +681,12 @@ irq_bottom_2: { jmp breturn //SEG27 irq_bottom_2::@return breturn: - //SEG28 [19] return [ ] ( ) + //SEG28 [19] return [ ] ( ) - exit interrupt(KERNEL_KEYBOARD) jmp $ea31 } //SEG29 irq_bottom_1 irq_bottom_1: { - //SEG30 interrupt KERNEL_MIN + //SEG30 entry interrupt(KERNEL_MIN) //SEG31 [20] *((const byte*) FGCOL#0) ← (const byte) WHITE#0 [ ] ( ) -- _deref_pbuc1=vbuc2 lda #WHITE sta FGCOL @@ -711,7 +711,7 @@ irq_bottom_1: { jmp breturn //SEG37 irq_bottom_1::@return breturn: - //SEG38 [26] return [ ] ( ) + //SEG38 [26] return [ ] ( ) - exit interrupt(KERNEL_MIN) jmp $ea81 } @@ -833,7 +833,7 @@ main: { } //SEG19 irq_bottom_2 irq_bottom_2: { - //SEG20 interrupt KERNEL_KEYBOARD + //SEG20 entry interrupt(KERNEL_KEYBOARD) //SEG21 [13] *((const byte*) FGCOL#0) ← (const byte) WHITE#0 [ ] ( ) -- _deref_pbuc1=vbuc2 lda #WHITE sta FGCOL @@ -856,12 +856,12 @@ irq_bottom_2: { lda #RED sta FGCOL //SEG27 irq_bottom_2::@return - //SEG28 [19] return [ ] ( ) + //SEG28 [19] return [ ] ( ) - exit interrupt(KERNEL_KEYBOARD) jmp $ea31 } //SEG29 irq_bottom_1 irq_bottom_1: { - //SEG30 interrupt KERNEL_MIN + //SEG30 entry interrupt(KERNEL_MIN) //SEG31 [20] *((const byte*) FGCOL#0) ← (const byte) WHITE#0 [ ] ( ) -- _deref_pbuc1=vbuc2 lda #WHITE sta FGCOL @@ -884,7 +884,7 @@ irq_bottom_1: { lda #RED sta FGCOL //SEG37 irq_bottom_1::@return - //SEG38 [26] return [ ] ( ) + //SEG38 [26] return [ ] ( ) - exit interrupt(KERNEL_MIN) jmp $ea81 } diff --git a/src/test/java/dk/camelot64/kickc/test/ref/irq-kernel.log b/src/test/java/dk/camelot64/kickc/test/ref/irq-kernel.log index 8b1feed4d..4f3212972 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/irq-kernel.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/irq-kernel.log @@ -369,7 +369,7 @@ main: { } //SEG18 irq irq: { - //SEG19 interrupt KERNEL_KEYBOARD + //SEG19 entry interrupt(KERNEL_KEYBOARD) //SEG20 [12] *((const byte*) BGCOL#0) ← (const byte) WHITE#0 [ ] ( ) -- _deref_pbuc1=vbuc2 lda #WHITE sta BGCOL @@ -382,7 +382,7 @@ irq: { jmp breturn //SEG23 irq::@return breturn: - //SEG24 [15] return [ ] ( ) + //SEG24 [15] return [ ] ( ) - exit interrupt(KERNEL_KEYBOARD) jmp $ea31 } @@ -468,7 +468,7 @@ main: { } //SEG18 irq irq: { - //SEG19 interrupt KERNEL_KEYBOARD + //SEG19 entry interrupt(KERNEL_KEYBOARD) //SEG20 [12] *((const byte*) BGCOL#0) ← (const byte) WHITE#0 [ ] ( ) -- _deref_pbuc1=vbuc2 lda #WHITE sta BGCOL @@ -481,7 +481,7 @@ irq: { jmp breturn //SEG23 irq::@return breturn: - //SEG24 [15] return [ ] ( ) + //SEG24 [15] return [ ] ( ) - exit interrupt(KERNEL_KEYBOARD) jmp $ea31 } @@ -590,7 +590,7 @@ main: { } //SEG18 irq irq: { - //SEG19 interrupt KERNEL_KEYBOARD + //SEG19 entry interrupt(KERNEL_KEYBOARD) //SEG20 [12] *((const byte*) BGCOL#0) ← (const byte) WHITE#0 [ ] ( ) -- _deref_pbuc1=vbuc2 lda #WHITE sta BGCOL @@ -601,7 +601,7 @@ irq: { lda #IRQ_RASTER sta IRQ_STATUS //SEG23 irq::@return - //SEG24 [15] return [ ] ( ) + //SEG24 [15] return [ ] ( ) - exit interrupt(KERNEL_KEYBOARD) jmp $ea31 } diff --git a/src/test/java/dk/camelot64/kickc/test/ref/irq-raster.log b/src/test/java/dk/camelot64/kickc/test/ref/irq-raster.log index a9b8ef23c..288aa39a7 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/irq-raster.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/irq-raster.log @@ -369,7 +369,7 @@ main: { } //SEG18 irq irq: { - //SEG19 interrupt KERNEL_MIN + //SEG19 entry interrupt(KERNEL_MIN) //SEG20 [12] *((const byte*) BGCOL#0) ← (const byte) WHITE#0 [ ] ( ) -- _deref_pbuc1=vbuc2 lda #WHITE sta BGCOL @@ -382,7 +382,7 @@ irq: { jmp breturn //SEG23 irq::@return breturn: - //SEG24 [15] return [ ] ( ) + //SEG24 [15] return [ ] ( ) - exit interrupt(KERNEL_MIN) jmp $ea81 } @@ -468,7 +468,7 @@ main: { } //SEG18 irq irq: { - //SEG19 interrupt KERNEL_MIN + //SEG19 entry interrupt(KERNEL_MIN) //SEG20 [12] *((const byte*) BGCOL#0) ← (const byte) WHITE#0 [ ] ( ) -- _deref_pbuc1=vbuc2 lda #WHITE sta BGCOL @@ -481,7 +481,7 @@ irq: { jmp breturn //SEG23 irq::@return breturn: - //SEG24 [15] return [ ] ( ) + //SEG24 [15] return [ ] ( ) - exit interrupt(KERNEL_MIN) jmp $ea81 } @@ -590,7 +590,7 @@ main: { } //SEG18 irq irq: { - //SEG19 interrupt KERNEL_MIN + //SEG19 entry interrupt(KERNEL_MIN) //SEG20 [12] *((const byte*) BGCOL#0) ← (const byte) WHITE#0 [ ] ( ) -- _deref_pbuc1=vbuc2 lda #WHITE sta BGCOL @@ -601,7 +601,7 @@ irq: { lda #IRQ_RASTER sta IRQ_STATUS //SEG23 irq::@return - //SEG24 [15] return [ ] ( ) + //SEG24 [15] return [ ] ( ) - exit interrupt(KERNEL_MIN) jmp $ea81 } diff --git a/src/test/java/dk/camelot64/kickc/test/ref/test-interrupt-volatile.log b/src/test/java/dk/camelot64/kickc/test/ref/test-interrupt-volatile.log index c11d05530..af0f39a2c 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/test-interrupt-volatile.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/test-interrupt-volatile.log @@ -338,7 +338,7 @@ main: { } //SEG16 irq irq: { - //SEG17 interrupt KERNEL_MIN + //SEG17 entry interrupt(KERNEL_MIN) //SEG18 asm { lda$dc0d } lda $dc0d //SEG19 [8] *((const byte*) BGCOL#0) ← (byte) col#0 [ ] ( ) -- _deref_pbuc1=vbuz1 @@ -347,7 +347,7 @@ irq: { jmp breturn //SEG20 irq::@return breturn: - //SEG21 [9] return [ ] ( ) + //SEG21 [9] return [ ] ( ) - exit interrupt(KERNEL_MIN) jmp $ea81 } @@ -418,7 +418,7 @@ main: { } //SEG16 irq irq: { - //SEG17 interrupt KERNEL_MIN + //SEG17 entry interrupt(KERNEL_MIN) //SEG18 asm { lda$dc0d } lda $dc0d //SEG19 [8] *((const byte*) BGCOL#0) ← (byte) col#0 [ ] ( ) -- _deref_pbuc1=vbuz1 @@ -427,7 +427,7 @@ irq: { jmp breturn //SEG20 irq::@return breturn: - //SEG21 [9] return [ ] ( ) + //SEG21 [9] return [ ] ( ) - exit interrupt(KERNEL_MIN) jmp $ea81 } @@ -511,14 +511,14 @@ main: { } //SEG16 irq irq: { - //SEG17 interrupt KERNEL_MIN + //SEG17 entry interrupt(KERNEL_MIN) //SEG18 asm { lda$dc0d } lda $dc0d //SEG19 [8] *((const byte*) BGCOL#0) ← (byte) col#0 [ ] ( ) -- _deref_pbuc1=vbuz1 lda col sta BGCOL //SEG20 irq::@return - //SEG21 [9] return [ ] ( ) + //SEG21 [9] return [ ] ( ) - exit interrupt(KERNEL_MIN) jmp $ea81 } diff --git a/src/test/java/dk/camelot64/kickc/test/ref/test-interrupt.log b/src/test/java/dk/camelot64/kickc/test/ref/test-interrupt.log index 01643987a..ca2367929 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/test-interrupt.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/test-interrupt.log @@ -279,7 +279,7 @@ main: { } //SEG12 irq irq: { - //SEG13 interrupt KERNEL_MIN + //SEG13 entry interrupt(KERNEL_MIN) //SEG14 [6] *((const byte*) BGCOL#0) ← ++ *((const byte*) BGCOL#0) [ ] ( ) -- _deref_pbuc1=_inc__deref_pbuc1 inc BGCOL //SEG15 asm { lda$dc0d } @@ -287,7 +287,7 @@ irq: { jmp breturn //SEG16 irq::@return breturn: - //SEG17 [8] return [ ] ( ) + //SEG17 [8] return [ ] ( ) - exit interrupt(KERNEL_MIN) jmp $ea81 } @@ -343,7 +343,7 @@ main: { } //SEG12 irq irq: { - //SEG13 interrupt KERNEL_MIN + //SEG13 entry interrupt(KERNEL_MIN) //SEG14 [6] *((const byte*) BGCOL#0) ← ++ *((const byte*) BGCOL#0) [ ] ( ) -- _deref_pbuc1=_inc__deref_pbuc1 inc BGCOL //SEG15 asm { lda$dc0d } @@ -351,7 +351,7 @@ irq: { jmp breturn //SEG16 irq::@return breturn: - //SEG17 [8] return [ ] ( ) + //SEG17 [8] return [ ] ( ) - exit interrupt(KERNEL_MIN) jmp $ea81 } @@ -420,13 +420,13 @@ main: { } //SEG12 irq irq: { - //SEG13 interrupt KERNEL_MIN + //SEG13 entry interrupt(KERNEL_MIN) //SEG14 [6] *((const byte*) BGCOL#0) ← ++ *((const byte*) BGCOL#0) [ ] ( ) -- _deref_pbuc1=_inc__deref_pbuc1 inc BGCOL //SEG15 asm { lda$dc0d } lda $dc0d //SEG16 irq::@return - //SEG17 [8] return [ ] ( ) + //SEG17 [8] return [ ] ( ) - exit interrupt(KERNEL_MIN) jmp $ea81 }