From 341d8c5556f1bba1e64d2238182c7d770d77fa72 Mon Sep 17 00:00:00 2001 From: jespergravgaard Date: Sun, 28 Jan 2018 23:09:47 +0100 Subject: [PATCH] Renamed dword fragments from vl... to vd... --- .../kickc/fragment/AsmFragmentInstanceSpec.java | 4 ++-- .../{vbuaa=_byte_vluz1.asm => vbuaa=_byte_vduz1.asm} | 0 ...uc1_plus_vbuaa.asm => vduz1=vduc1_plus_vbuaa.asm} | 0 src/test/java/dk/camelot64/kickc/test/ref/dword.log | 12 ++++++------ 4 files changed, 8 insertions(+), 8 deletions(-) rename src/main/java/dk/camelot64/kickc/fragment/asm/{vbuaa=_byte_vluz1.asm => vbuaa=_byte_vduz1.asm} (100%) rename src/main/java/dk/camelot64/kickc/fragment/asm/{vluz1=vluc1_plus_vbuaa.asm => vduz1=vduc1_plus_vbuaa.asm} (100%) diff --git a/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentInstanceSpec.java b/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentInstanceSpec.java index 39c186582..6cbc94abf 100644 --- a/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentInstanceSpec.java +++ b/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentInstanceSpec.java @@ -279,9 +279,9 @@ public class AsmFragmentInstanceSpec { } else if(SymbolType.isSWord(type)) { return "vws"; } else if(SymbolType.isDWord(type)) { - return "vlu"; + return "vdu"; } else if(SymbolType.isSDWord(type)) { - return "vls"; + return "vds"; } else if(SymbolType.STRING.equals(type)) { return "pbu"; } else if(type instanceof SymbolTypePointer) { diff --git a/src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=_byte_vluz1.asm b/src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=_byte_vduz1.asm similarity index 100% rename from src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=_byte_vluz1.asm rename to src/main/java/dk/camelot64/kickc/fragment/asm/vbuaa=_byte_vduz1.asm diff --git a/src/main/java/dk/camelot64/kickc/fragment/asm/vluz1=vluc1_plus_vbuaa.asm b/src/main/java/dk/camelot64/kickc/fragment/asm/vduz1=vduc1_plus_vbuaa.asm similarity index 100% rename from src/main/java/dk/camelot64/kickc/fragment/asm/vluz1=vluc1_plus_vbuaa.asm rename to src/main/java/dk/camelot64/kickc/fragment/asm/vduz1=vduc1_plus_vbuaa.asm diff --git a/src/test/java/dk/camelot64/kickc/test/ref/dword.log b/src/test/java/dk/camelot64/kickc/test/ref/dword.log index 9123eba91..f970b0372 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/dword.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/dword.log @@ -293,7 +293,7 @@ main: { jmp b1 //SEG14 main::@1 b1: - //SEG15 [6] (dword) main::b#0 ← (const dword) main::a#0 + (byte) main::i#2 [ main::i#2 main::b#0 ] ( main:2 [ main::i#2 main::b#0 ] ) -- vluz1=vluc1_plus_vbuz2 + //SEG15 [6] (dword) main::b#0 ← (const dword) main::a#0 + (byte) main::i#2 [ main::i#2 main::b#0 ] ( main:2 [ main::i#2 main::b#0 ] ) -- vduz1=vduc1_plus_vbuz2 lda i clc adc #a>>$10 adc #0 sta b+3 - //SEG16 [7] (byte) main::c#0 ← ((byte)) (dword) main::b#0 [ main::i#2 main::c#0 ] ( main:2 [ main::i#2 main::c#0 ] ) -- vbuz1=_byte_vluz2 + //SEG16 [7] (byte) main::c#0 ← ((byte)) (dword) main::b#0 [ main::i#2 main::c#0 ] ( main:2 [ main::i#2 main::c#0 ] ) -- vbuz1=_byte_vduz2 lda b sta c //SEG17 [8] *((const byte*) main::SCREEN#0 + (byte) main::i#2) ← (byte) main::c#0 [ main::i#2 ] ( main:2 [ main::i#2 ] ) -- pbuc1_derefidx_vbuz1=vbuz2 @@ -383,7 +383,7 @@ main: { jmp b1 //SEG14 main::@1 b1: - //SEG15 [6] (dword) main::b#0 ← (const dword) main::a#0 + (byte) main::i#2 [ main::i#2 main::b#0 ] ( main:2 [ main::i#2 main::b#0 ] ) -- vluz1=vluc1_plus_vbuxx + //SEG15 [6] (dword) main::b#0 ← (const dword) main::a#0 + (byte) main::i#2 [ main::i#2 main::b#0 ] ( main:2 [ main::i#2 main::b#0 ] ) -- vduz1=vduc1_plus_vbuxx txa clc adc #a>>$10 adc #0 sta b+3 - //SEG16 [7] (byte) main::c#0 ← ((byte)) (dword) main::b#0 [ main::i#2 main::c#0 ] ( main:2 [ main::i#2 main::c#0 ] ) -- vbuaa=_byte_vluz1 + //SEG16 [7] (byte) main::c#0 ← ((byte)) (dword) main::b#0 [ main::i#2 main::c#0 ] ( main:2 [ main::i#2 main::c#0 ] ) -- vbuaa=_byte_vduz1 lda b //SEG17 [8] *((const byte*) main::SCREEN#0 + (byte) main::i#2) ← (byte) main::c#0 [ main::i#2 ] ( main:2 [ main::i#2 ] ) -- pbuc1_derefidx_vbuxx=vbuaa sta SCREEN,x @@ -486,7 +486,7 @@ main: { //SEG13 [5] phi (byte) main::i#2 = (byte) main::i#1 [phi:main::@1->main::@1#0] -- register_copy //SEG14 main::@1 b1: - //SEG15 [6] (dword) main::b#0 ← (const dword) main::a#0 + (byte) main::i#2 [ main::i#2 main::b#0 ] ( main:2 [ main::i#2 main::b#0 ] ) -- vluz1=vluc1_plus_vbuxx + //SEG15 [6] (dword) main::b#0 ← (const dword) main::a#0 + (byte) main::i#2 [ main::i#2 main::b#0 ] ( main:2 [ main::i#2 main::b#0 ] ) -- vduz1=vduc1_plus_vbuxx txa clc adc #a>>$10 adc #0 sta b+3 - //SEG16 [7] (byte) main::c#0 ← ((byte)) (dword) main::b#0 [ main::i#2 main::c#0 ] ( main:2 [ main::i#2 main::c#0 ] ) -- vbuaa=_byte_vluz1 + //SEG16 [7] (byte) main::c#0 ← ((byte)) (dword) main::b#0 [ main::i#2 main::c#0 ] ( main:2 [ main::i#2 main::c#0 ] ) -- vbuaa=_byte_vduz1 lda b //SEG17 [8] *((const byte*) main::SCREEN#0 + (byte) main::i#2) ← (byte) main::c#0 [ main::i#2 ] ( main:2 [ main::i#2 ] ) -- pbuc1_derefidx_vbuxx=vbuaa sta SCREEN,x