diff --git a/src/main/java/dk/camelot64/kickc/Compiler.java b/src/main/java/dk/camelot64/kickc/Compiler.java index 5c43c502f..d0deb39e8 100644 --- a/src/main/java/dk/camelot64/kickc/Compiler.java +++ b/src/main/java/dk/camelot64/kickc/Compiler.java @@ -397,7 +397,6 @@ public class Compiler { constantOptimizations.add(new Pass2NopCastInlining(program)); constantOptimizations.add(new Pass2MultiplyToShiftRewriting(program)); constantOptimizations.add(new Pass2ConstantInlining(program)); - constantOptimizations.add(new Pass2ArrayInStructInlining(program)); constantOptimizations.add(new Pass2ConstantAdditionElimination(program)); constantOptimizations.add(new Pass2ConstantSimplification(program)); constantOptimizations.addAll(getPass2Optimizations()); diff --git a/src/main/java/dk/camelot64/kickc/asm/AsmFormat.java b/src/main/java/dk/camelot64/kickc/asm/AsmFormat.java index 067a2c270..8e7e3f6d2 100644 --- a/src/main/java/dk/camelot64/kickc/asm/AsmFormat.java +++ b/src/main/java/dk/camelot64/kickc/asm/AsmFormat.java @@ -169,7 +169,7 @@ public class AsmFormat { SymbolType operandType = SymbolTypeInference.inferType(program.getScope(), operand); if(SymbolType.BYTE.equals(operandType) || SymbolType.SBYTE.equals(operandType)) { return getAsmConstant(program, operand, outerPrecedence, codeScope); - } else if(SymbolType.WORD.equals(operandType) || SymbolType.SWORD.equals(operandType) || operandType instanceof SymbolTypePointer || SymbolType.STRING.equals(operandType)) { + } else if(SymbolType.WORD.equals(operandType) || SymbolType.SWORD.equals(operandType) || operandType instanceof SymbolTypePointer) { return "<" + getAsmConstant(program, operand, outerPrecedence, codeScope); } else if(SymbolType.DWORD.equals(operandType) || SymbolType.SDWORD.equals(operandType)) { return getAsmConstant(program, new ConstantBinary(operand, Operators.BOOL_AND, new ConstantInteger((long) 0xffff)), outerPrecedence, codeScope); @@ -180,7 +180,7 @@ public class AsmFormat { SymbolType operandType = SymbolTypeInference.inferType(program.getScope(), operand); if(SymbolType.BYTE.equals(operandType) || SymbolType.SBYTE.equals(operandType)) { return getAsmConstant(program, new ConstantInteger(0l), outerPrecedence, codeScope); - } else if(SymbolType.WORD.equals(operandType) || SymbolType.SWORD.equals(operandType) || operandType instanceof SymbolTypePointer || SymbolType.STRING.equals(operandType)) { + } else if(SymbolType.WORD.equals(operandType) || SymbolType.SWORD.equals(operandType) || operandType instanceof SymbolTypePointer) { return ">" + getAsmConstant(program, operand, outerPrecedence, codeScope); } else if(SymbolType.DWORD.equals(operandType) || SymbolType.SDWORD.equals(operandType)) { return getAsmConstant(program, new ConstantBinary(operand, Operators.SHIFT_RIGHT, new ConstantInteger((long) 16)), outerPrecedence, codeScope); @@ -195,7 +195,7 @@ public class AsmFormat { SymbolType operandType = SymbolTypeInference.inferType(program.getScope(), operand); if(SymbolType.BYTE.equals(operandType) || SymbolType.SBYTE.equals(operandType)) { return getAsmConstant(program, new ConstantBinary(operand, Operators.BOOL_XOR, new ConstantInteger((long) 0xff)), outerPrecedence, codeScope); - } else if(SymbolType.WORD.equals(operandType) || SymbolType.SWORD.equals(operandType) || operandType instanceof SymbolTypePointer || SymbolType.STRING.equals(operandType)) { + } else if(SymbolType.WORD.equals(operandType) || SymbolType.SWORD.equals(operandType) || operandType instanceof SymbolTypePointer) { return getAsmConstant(program, new ConstantBinary(operand, Operators.BOOL_XOR, new ConstantInteger((long) 0xffff)), outerPrecedence, codeScope); } else if(SymbolType.DWORD.equals(operandType) || SymbolType.SDWORD.equals(operandType)) { return getAsmConstant(program, new ConstantBinary(operand, Operators.BOOL_XOR, new ConstantInteger((long) 0xffffffff)), outerPrecedence, codeScope); diff --git a/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentInstanceSpecFactory.java b/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentInstanceSpecFactory.java index b7021a4e9..c916e674f 100644 --- a/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentInstanceSpecFactory.java +++ b/src/main/java/dk/camelot64/kickc/fragment/AsmFragmentInstanceSpecFactory.java @@ -422,8 +422,6 @@ public class AsmFragmentInstanceSpecFactory { return "vdu"; } else if(SymbolType.SDWORD.equals(type)) { return "vds"; - } else if(SymbolType.STRING.equals(type)) { - return "pbu"; } else if(SymbolType.BOOLEAN.equals(type)) { return "vbo"; } else if(type instanceof SymbolTypeStruct) { diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorGetHigh.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorGetHigh.java index 82367f396..0cb3ae430 100644 --- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorGetHigh.java +++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorGetHigh.java @@ -46,8 +46,6 @@ public class OperatorGetHigh extends OperatorUnary { return SymbolType.WORD; } else if(SymbolType.BYTE.equals(operandType) || SymbolType.SBYTE.equals(operandType)) { return SymbolType.BYTE; - } else if(SymbolType.STRING.equals(operandType)) { - return SymbolType.BYTE; } else if(SymbolType.NUMBER.equals(operandType)) { return SymbolType.NUMBER; } else if(SymbolType.UNUMBER.equals(operandType)) { diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorGetLow.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorGetLow.java index e162f4d0d..01d7605e5 100644 --- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorGetLow.java +++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorGetLow.java @@ -46,8 +46,6 @@ public class OperatorGetLow extends OperatorUnary { return SymbolType.WORD; } else if(SymbolType.BYTE.equals(operandType) || SymbolType.SBYTE.equals(operandType)) { return SymbolType.BYTE; - } else if(SymbolType.STRING.equals(operandType)) { - return SymbolType.BYTE; } else if(SymbolType.NUMBER.equals(operandType)) { return SymbolType.NUMBER; } else if(SymbolType.UNUMBER.equals(operandType)) { diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorMinus.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorMinus.java index b8c6bc56f..6d2d5f1e9 100644 --- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorMinus.java +++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorMinus.java @@ -40,8 +40,6 @@ public class OperatorMinus extends OperatorBinary { return new SymbolTypePointer(((SymbolTypePointer) type1).getElementType()); } else if(type1 instanceof SymbolTypePointer && type2 instanceof SymbolTypePointer) { return SymbolType.WORD; - } else if(SymbolType.STRING.equals(type1) && SymbolType.isInteger(type2)) { - return new SymbolTypePointer(SymbolType.BYTE); } // Handle numeric types through proper promotion if(SymbolType.isInteger(type1) && SymbolType.isInteger(type2)) { diff --git a/src/main/java/dk/camelot64/kickc/model/operators/OperatorPlus.java b/src/main/java/dk/camelot64/kickc/model/operators/OperatorPlus.java index 371362971..d771f874b 100644 --- a/src/main/java/dk/camelot64/kickc/model/operators/OperatorPlus.java +++ b/src/main/java/dk/camelot64/kickc/model/operators/OperatorPlus.java @@ -39,8 +39,6 @@ public class OperatorPlus extends OperatorBinary { return new SymbolTypePointer(((SymbolTypePointer) type2).getElementType()); } else if(type1 instanceof SymbolTypePointer && SymbolType.isInteger(type2)) { return new SymbolTypePointer(((SymbolTypePointer) type1).getElementType()); - } else if(SymbolType.STRING.equals(type1) && SymbolType.isInteger(type2)) { - return new SymbolTypePointer(SymbolType.BYTE); } // Handle numeric types through proper promotion if(SymbolType.isInteger(type1) && SymbolType.isInteger(type2)) { diff --git a/src/main/java/dk/camelot64/kickc/model/types/SymbolType.java b/src/main/java/dk/camelot64/kickc/model/types/SymbolType.java index d98111c07..669e02f63 100644 --- a/src/main/java/dk/camelot64/kickc/model/types/SymbolType.java +++ b/src/main/java/dk/camelot64/kickc/model/types/SymbolType.java @@ -23,8 +23,6 @@ public interface SymbolType extends Serializable { SymbolTypeIntegerAuto UNUMBER = new SymbolTypeIntegerAuto("unumber"); /** Signed integer with unknown size (used for constant expressions). */ SymbolTypeIntegerAuto SNUMBER = new SymbolTypeIntegerAuto("snumber"); - /** String value (treated like byte* ). */ - SymbolTypeNamed STRING = new SymbolTypeNamed("string", 99); /** Boolean value. */ SymbolTypeNamed BOOLEAN = new SymbolTypeNamed("bool", 1); /** Numeric floating point value. */ @@ -86,8 +84,6 @@ public interface SymbolType extends Serializable { return DWORD; case "signed long": return SDWORD; - case "string": - return STRING; case "bool": return BOOLEAN; case "void": diff --git a/src/main/java/dk/camelot64/kickc/model/types/SymbolTypeConversion.java b/src/main/java/dk/camelot64/kickc/model/types/SymbolTypeConversion.java index 53e9b0436..43c7c53ca 100644 --- a/src/main/java/dk/camelot64/kickc/model/types/SymbolTypeConversion.java +++ b/src/main/java/dk/camelot64/kickc/model/types/SymbolTypeConversion.java @@ -224,10 +224,6 @@ public class SymbolTypeConversion { // R-value is still a number - constants are probably not done being identified & typed return true; } - if(SymbolType.STRING.equals(rValueType) && lValueType instanceof SymbolTypePointer && SymbolType.BYTE.equals(((SymbolTypePointer) lValueType).getElementType())) { - // String value can be assigned into a pointer - return true; - } if(lValueType instanceof SymbolTypePointer && rValueType instanceof SymbolTypePointer && assignmentTypeMatch(((SymbolTypePointer) lValueType).getElementType(), ((SymbolTypePointer) rValueType).getElementType())) { // Pointer types assigned from each other return true; @@ -247,8 +243,6 @@ public class SymbolTypeConversion { return false; else if(lValueType instanceof SymbolTypePointer && rValueType instanceof SymbolTypePointer && ((SymbolTypePointer) lValueType).getElementType().equals(((SymbolTypePointer) rValueType).getElementType())) return false; - else if(lValueType instanceof SymbolTypePointer && SymbolType.STRING.equals(rValueType) && SymbolType.BYTE.equals(((SymbolTypePointer) lValueType).getElementType())) - return false; else return true; } diff --git a/src/main/java/dk/camelot64/kickc/model/types/SymbolTypeInference.java b/src/main/java/dk/camelot64/kickc/model/types/SymbolTypeInference.java index dd81b2f1a..bb416c71e 100644 --- a/src/main/java/dk/camelot64/kickc/model/types/SymbolTypeInference.java +++ b/src/main/java/dk/camelot64/kickc/model/types/SymbolTypeInference.java @@ -28,7 +28,7 @@ public class SymbolTypeInference { } else if(rValue instanceof ConstantInteger) { return ((ConstantInteger) rValue).getType(symbols); } else if(rValue instanceof ConstantString) { - type = SymbolType.STRING; + type = new SymbolTypePointer(SymbolType.BYTE); } else if(rValue instanceof ConstantChar) { type = SymbolType.BYTE; } else if(rValue instanceof ConstantBool) { @@ -48,8 +48,6 @@ public class SymbolTypeInference { SymbolType pointerType = inferType(symbols, ((PointerDereference) rValue).getPointer()); if(pointerType instanceof SymbolTypePointer) { return ((SymbolTypePointer) pointerType).getElementType(); - } else if(pointerType.equals(SymbolType.STRING)) { - return SymbolType.BYTE; } else { return SymbolType.VAR; } diff --git a/src/main/java/dk/camelot64/kickc/model/values/ConstantString.java b/src/main/java/dk/camelot64/kickc/model/values/ConstantString.java index 1e4f12b8d..58fc679f0 100644 --- a/src/main/java/dk/camelot64/kickc/model/values/ConstantString.java +++ b/src/main/java/dk/camelot64/kickc/model/values/ConstantString.java @@ -4,6 +4,7 @@ import dk.camelot64.kickc.model.CompileError; import dk.camelot64.kickc.model.Program; import dk.camelot64.kickc.model.symbols.ProgramScope; import dk.camelot64.kickc.model.types.SymbolType; +import dk.camelot64.kickc.model.types.SymbolTypePointer; import java.util.Objects; @@ -46,7 +47,7 @@ public class ConstantString implements ConstantLiteral { @Override public SymbolType getType(ProgramScope scope) { - return SymbolType.STRING; + return new SymbolTypePointer(SymbolType.BYTE); } @Override @@ -86,7 +87,7 @@ public class ConstantString implements ConstantLiteral { if(program == null) { return "\"" + value + "\"" + suffix; } else { - return "(" + SymbolType.STRING.getTypeName() + ") " + "\"" + value + "\"" + suffix; + return "(" + getType(program.getScope()).getTypeName() + ") " + "\"" + value + "\"" + suffix; } } diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass2ArrayInStructInlining.java b/src/main/java/dk/camelot64/kickc/passes/Pass2ArrayInStructInlining.java deleted file mode 100644 index 75413f21f..000000000 --- a/src/main/java/dk/camelot64/kickc/passes/Pass2ArrayInStructInlining.java +++ /dev/null @@ -1,76 +0,0 @@ -package dk.camelot64.kickc.passes; - -import dk.camelot64.kickc.model.Program; -import dk.camelot64.kickc.model.iterator.ProgramValue; -import dk.camelot64.kickc.model.iterator.ProgramValueIterator; -import dk.camelot64.kickc.model.symbols.Variable; -import dk.camelot64.kickc.model.types.SymbolType; -import dk.camelot64.kickc.model.values.ConstantRef; -import dk.camelot64.kickc.model.values.ConstantValue; -import dk.camelot64.kickc.model.values.SymbolVariableRef; -import dk.camelot64.kickc.model.values.Value; - -import java.util.HashMap; -import java.util.Map; - -/** - * Compiler Pass inlining arrays inside literal structs - */ -public class Pass2ArrayInStructInlining extends Pass2SsaOptimization { - - public Pass2ArrayInStructInlining(Program program) { - super(program); - } - - /** - * Consolidate unnamed constants into other constants value - * - * @return true optimization was performed. false if no optimization was possible. - */ - @Override - public boolean step() { - Map inline = new HashMap<>(); - inline.putAll(findArrayInStruct()); - - // Replace all usages of the constants in the control flow graph or symbol table - replaceVariables(inline); - // Remove from symbol table - deleteSymbols(getScope(), inline.keySet()); - - for(ConstantRef constantRef : inline.keySet()) { - getLog().append("Constant array inlined into struct " + constantRef.toString() + " = " + inline.get(constantRef).toString(getProgram())); - } - - return inline.size() > 0; - - } - - /** - * Find constant fixed size arrays inside structs. - * - * @return Map from constant name to constant value - */ - private Map findArrayInStruct() { - Map inline = new HashMap<>(); - ProgramValueIterator.execute(getProgram(), (programValue, currentStmt, stmtIt, currentBlock) -> { - Value value = programValue.get(); - if(programValue instanceof ProgramValue.ProgramValueConstantStructMember) { - SymbolVariableRef memberRef = ((ProgramValue.ProgramValueConstantStructMember) programValue).getMemberRef(); - Variable structMemberVar = getScope().getVar(memberRef); - if(structMemberVar.isArray() && structMemberVar.getArraySize() != null) { - if(value instanceof ConstantValue) { - ConstantValue constantValue = (ConstantValue) value; - if(constantValue.getType(getProgram().getScope()).equals(SymbolType.STRING)) { - if(constantValue instanceof ConstantRef) { - Variable constantStringVar = getScope().getConstant((ConstantRef) constantValue); - inline.put((ConstantRef) constantValue, constantStringVar.getInitValue()); - } - } - } - } - } - }); - return inline; - } - -} diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass4CodeGeneration.java b/src/main/java/dk/camelot64/kickc/passes/Pass4CodeGeneration.java index c3c2258ac..58fc40a34 100644 --- a/src/main/java/dk/camelot64/kickc/passes/Pass4CodeGeneration.java +++ b/src/main/java/dk/camelot64/kickc/passes/Pass4CodeGeneration.java @@ -644,7 +644,16 @@ public class Pass4CodeGeneration { } dataChunk.addDataKickAsm(bytes, kickAsm.getKickAsmCode(), getEncoding(value)); dataNumElements = bytes; - } else if(dataType.equals(SymbolType.STRING)) { + } else if(value instanceof ConstantString) { + ConstantString stringValue = (ConstantString) value; + String asmConstant = AsmFormat.getAsmConstant(program, stringValue, 99, scopeRef); + dataChunk.addDataString(asmConstant, getEncoding(stringValue)); + if(stringValue.isZeroTerminated()) { + dataChunk.addDataNumeric(AsmDataNumeric.Type.BYTE, "0", null); + } + dataNumElements = stringValue.getStringLength(); + + /* try { ConstantLiteral literal = value.calculateLiteral(getScope()); if(literal instanceof ConstantString) { @@ -659,6 +668,7 @@ public class Pass4CodeGeneration { } catch(ConstantNotLiteral e) { // can't calculate literal value, so it is not data - just return } + */ } else { // Assume we have a ConstantArrayList ConstantArrayList constantArrayList = (ConstantArrayList) value; diff --git a/src/main/java/dk/camelot64/kickc/passes/PassNAddTypeConversionAssignment.java b/src/main/java/dk/camelot64/kickc/passes/PassNAddTypeConversionAssignment.java index 47f7cdec9..b2b9edfab 100644 --- a/src/main/java/dk/camelot64/kickc/passes/PassNAddTypeConversionAssignment.java +++ b/src/main/java/dk/camelot64/kickc/passes/PassNAddTypeConversionAssignment.java @@ -58,16 +58,6 @@ public class PassNAddTypeConversionAssignment extends Pass2SsaOptimization { getLog().append("Adding pointer type conversion cast to void pointer (" + leftType + ") " + binary.getRight().toString() + " in " + currentStmt.toString(getProgram(), false)); binary.addRightCast(leftType, stmtIt, currentBlock.getScope(), getScope()); modified.set(true); - } else if((leftType instanceof SymbolTypePointer) && SymbolType.STRING.equals(rightType) && SymbolType.VOID.equals(((SymbolTypePointer) leftType).getElementType())) { - if(pass2 || getLog().isVerbosePass1CreateSsa()) - getLog().append("Adding void pointer type conversion cast (" + leftType + ") " + binary.getRight().toString() + " in " + currentStmt.toString(getProgram(), false)); - binary.addRightCast(leftType, stmtIt, currentBlock.getScope(), getScope()); - modified.set(true); - } else if(leftType.equals(SymbolType.STRING) && rightType instanceof SymbolTypePointer && SymbolType.VOID.equals(((SymbolTypePointer) rightType).getElementType())) { - if(pass2 || getLog().isVerbosePass1CreateSsa()) - getLog().append("Adding pointer type conversion cast to void pointer (" + leftType + ") " + binary.getRight().toString() + " in " + currentStmt.toString(getProgram(), false)); - binary.addRightCast(leftType, stmtIt, currentBlock.getScope(), getScope()); - modified.set(true); } else if(SymbolType.WORD.equals(leftType) && isLiteralWordCandidate(right)) { // Detect word literal constructor SymbolType conversionType = SymbolType.WORD; diff --git a/src/test/ref/arrays-init-short.log b/src/test/ref/arrays-init-short.log index c0f4868c3..28fa3a459 100644 --- a/src/test/ref/arrays-init-short.log +++ b/src/test/ref/arrays-init-short.log @@ -74,7 +74,7 @@ SYMBOL TABLE SSA (byte) main::i1#1 (byte) main::i1#2 (byte) main::i1#3 -(const byte*) msg1[(number) $10] = (string) "camelot" +(const byte*) msg1[(number) $10] = (byte*) "camelot" (const byte*) msg2[(number) $10] = { (byte) 'c', (byte) 'm', (byte) 'l' } Adding number conversion cast (unumber) 0 in (bool~) main::$0 ← (number) 0 != *((const byte*) msg1 + (byte) main::i#2) @@ -421,7 +421,7 @@ FINAL SYMBOL TABLE (byte) main::i1 (byte) main::i1#1 reg byte x 22.0 (byte) main::i1#2 reg byte x 18.333333333333332 -(const byte*) msg1[(number) $10] = (string) "camelot" +(const byte*) msg1[(number) $10] = (byte*) "camelot" (const byte*) msg2[(number) $10] = { (byte) 'c', (byte) 'm', (byte) 'l' } reg byte x [ main::i#2 main::i#1 ] diff --git a/src/test/ref/arrays-init-short.sym b/src/test/ref/arrays-init-short.sym index 28ee7a9dd..de2d5bde9 100644 --- a/src/test/ref/arrays-init-short.sym +++ b/src/test/ref/arrays-init-short.sym @@ -14,7 +14,7 @@ (byte) main::i1 (byte) main::i1#1 reg byte x 22.0 (byte) main::i1#2 reg byte x 18.333333333333332 -(const byte*) msg1[(number) $10] = (string) "camelot" +(const byte*) msg1[(number) $10] = (byte*) "camelot" (const byte*) msg2[(number) $10] = { (byte) 'c', (byte) 'm', (byte) 'l' } reg byte x [ main::i#2 main::i#1 ] diff --git a/src/test/ref/arrays-init.log b/src/test/ref/arrays-init.log index 8e7aadabc..bf04612bc 100644 --- a/src/test/ref/arrays-init.log +++ b/src/test/ref/arrays-init.log @@ -31,7 +31,7 @@ SYMBOL TABLE SSA (const byte*) SCREEN = (byte*)(number) $400 (const byte*) b[(number) 3] = { fill( 3, 0) } (const byte*) c[] = { (byte) 'c', (byte) 'm', (byte) 'l' } -(const byte*) d[] = (string) "cml"z +(const byte*) d[] = (byte*) "cml"z (void()) main() (byte*~) main::$0 (byte*~) main::$1 @@ -253,7 +253,7 @@ FINAL SYMBOL TABLE (const byte*) SCREEN = (byte*) 1024 (const byte*) b[(number) 3] = { fill( 3, 0) } (const byte*) c[] = { (byte) 'c', (byte) 'm', (byte) 'l' } -(const byte*) d[] = (string) "cml"z +(const byte*) d[] = (byte*) "cml"z (void()) main() (label) main::@return diff --git a/src/test/ref/arrays-init.sym b/src/test/ref/arrays-init.sym index 873e876b6..1f3040045 100644 --- a/src/test/ref/arrays-init.sym +++ b/src/test/ref/arrays-init.sym @@ -4,7 +4,7 @@ (const byte*) SCREEN = (byte*) 1024 (const byte*) b[(number) 3] = { fill( 3, 0) } (const byte*) c[] = { (byte) 'c', (byte) 'm', (byte) 'l' } -(const byte*) d[] = (string) "cml"z +(const byte*) d[] = (byte*) "cml"z (void()) main() (label) main::@return diff --git a/src/test/ref/c-types.log b/src/test/ref/c-types.log index b69d883a5..9f646ee41 100644 --- a/src/test/ref/c-types.log +++ b/src/test/ref/c-types.log @@ -1013,7 +1013,7 @@ SYMBOL TABLE SSA (dword) print_dword::dw#1 (dword) print_dword::dw#2 (dword) print_dword::dw#3 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#0 (byte*) print_line_cursor#1 @@ -1200,7 +1200,7 @@ SYMBOL TABLE SSA (label) testChar::@return (const byte) testChar::n = (byte) $e (const signed byte) testChar::s = (signed byte) -$e -(const byte*) testChar::str[(byte) 7] = (string) "char: " +(const byte*) testChar::str[(byte) 7] = (byte*) "char: " (const byte) testChar::u = (byte) $e (void()) testInt() (label) testInt::@1 @@ -1213,7 +1213,7 @@ SYMBOL TABLE SSA (label) testInt::@return (const signed word) testInt::n = (signed word) -$578 (const signed word) testInt::s = (signed word) -$578 -(const byte*) testInt::str[(byte) 6] = (string) "int: " +(const byte*) testInt::str[(byte) 6] = (byte*) "int: " (const word) testInt::u = (word) $578 (void()) testLong() (label) testLong::@1 @@ -1226,7 +1226,7 @@ SYMBOL TABLE SSA (label) testLong::@return (const signed dword) testLong::n = (signed dword) -$222e0 (const signed dword) testLong::s = (signed dword) -$222e0 -(const byte*) testLong::str[(byte) 7] = (string) "long: " +(const byte*) testLong::str[(byte) 7] = (byte*) "long: " (const dword) testLong::u = (dword) $222e0 (void()) testShort() (label) testShort::@1 @@ -1239,7 +1239,7 @@ SYMBOL TABLE SSA (label) testShort::@return (const signed word) testShort::n = (signed word) -$578 (const signed word) testShort::s = (signed word) -$578 -(const byte*) testShort::str[(byte) 8] = (string) "short: " +(const byte*) testShort::str[(byte) 8] = (byte*) "short: " (const word) testShort::u = (word) $578 Adding number conversion cast (unumber) 0 in (bool~) memset::$0 ← (word) memset::num#1 > (number) 0 @@ -4542,7 +4542,7 @@ FINAL SYMBOL TABLE (dword) print_dword::dw (dword) print_dword::dw#0 dw zp[4]:2 4.0 (dword) print_dword::dw#2 dw zp[4]:2 2.0 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:10 0.8333333333333333 (byte*) print_line_cursor#20 print_line_cursor zp[2]:10 24.0 @@ -4603,7 +4603,7 @@ FINAL SYMBOL TABLE (label) testChar::@return (const byte) testChar::n = (byte) $e (const signed byte) testChar::s = (signed byte) -$e -(const byte*) testChar::str[(byte) 7] = (string) "char: " +(const byte*) testChar::str[(byte) 7] = (byte*) "char: " (const byte) testChar::u = (byte) $e (void()) testInt() (label) testInt::@1 @@ -4615,7 +4615,7 @@ FINAL SYMBOL TABLE (label) testInt::@return (const signed word) testInt::n = (signed word) -$578 (const signed word) testInt::s = (signed word) -$578 -(const byte*) testInt::str[(byte) 6] = (string) "int: " +(const byte*) testInt::str[(byte) 6] = (byte*) "int: " (const word) testInt::u = (word) $578 (void()) testLong() (label) testLong::@1 @@ -4627,7 +4627,7 @@ FINAL SYMBOL TABLE (label) testLong::@return (const signed dword) testLong::n = (signed dword) -$222e0 (const signed dword) testLong::s = (signed dword) -$222e0 -(const byte*) testLong::str[(byte) 7] = (string) "long: " +(const byte*) testLong::str[(byte) 7] = (byte*) "long: " (const dword) testLong::u = (dword) $222e0 (void()) testShort() (label) testShort::@1 @@ -4639,7 +4639,7 @@ FINAL SYMBOL TABLE (label) testShort::@return (const signed word) testShort::n = (signed word) -$578 (const signed word) testShort::s = (signed word) -$578 -(const byte*) testShort::str[(byte) 8] = (string) "short: " +(const byte*) testShort::str[(byte) 8] = (byte*) "short: " (const word) testShort::u = (word) $578 zp[4]:2 [ print_sdword::dw#5 print_sdword::dw#0 print_sdword::dw#3 print_dword::dw#2 print_dword::dw#0 ] diff --git a/src/test/ref/c-types.sym b/src/test/ref/c-types.sym index 90caa5ad0..28b3cc4bc 100644 --- a/src/test/ref/c-types.sym +++ b/src/test/ref/c-types.sym @@ -62,7 +62,7 @@ (dword) print_dword::dw (dword) print_dword::dw#0 dw zp[4]:2 4.0 (dword) print_dword::dw#2 dw zp[4]:2 2.0 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:10 0.8333333333333333 (byte*) print_line_cursor#20 print_line_cursor zp[2]:10 24.0 @@ -123,7 +123,7 @@ (label) testChar::@return (const byte) testChar::n = (byte) $e (const signed byte) testChar::s = (signed byte) -$e -(const byte*) testChar::str[(byte) 7] = (string) "char: " +(const byte*) testChar::str[(byte) 7] = (byte*) "char: " (const byte) testChar::u = (byte) $e (void()) testInt() (label) testInt::@1 @@ -135,7 +135,7 @@ (label) testInt::@return (const signed word) testInt::n = (signed word) -$578 (const signed word) testInt::s = (signed word) -$578 -(const byte*) testInt::str[(byte) 6] = (string) "int: " +(const byte*) testInt::str[(byte) 6] = (byte*) "int: " (const word) testInt::u = (word) $578 (void()) testLong() (label) testLong::@1 @@ -147,7 +147,7 @@ (label) testLong::@return (const signed dword) testLong::n = (signed dword) -$222e0 (const signed dword) testLong::s = (signed dword) -$222e0 -(const byte*) testLong::str[(byte) 7] = (string) "long: " +(const byte*) testLong::str[(byte) 7] = (byte*) "long: " (const dword) testLong::u = (dword) $222e0 (void()) testShort() (label) testShort::@1 @@ -159,7 +159,7 @@ (label) testShort::@return (const signed word) testShort::n = (signed word) -$578 (const signed word) testShort::s = (signed word) -$578 -(const byte*) testShort::str[(byte) 8] = (string) "short: " +(const byte*) testShort::str[(byte) 8] = (byte*) "short: " (const word) testShort::u = (word) $578 zp[4]:2 [ print_sdword::dw#5 print_sdword::dw#0 print_sdword::dw#3 print_dword::dw#2 print_dword::dw#0 ] diff --git a/src/test/ref/c64dtv-blitter-box.log b/src/test/ref/c64dtv-blitter-box.log index 397b79a51..29756b359 100644 --- a/src/test/ref/c64dtv-blitter-box.log +++ b/src/test/ref/c64dtv-blitter-box.log @@ -109,7 +109,7 @@ SYMBOL TABLE SSA (const byte*) DTV_FEATURE = (byte*)(number) $d03f (const byte) DTV_FEATURE_ENABLE = (byte) 1 (const byte*) SCREEN = (byte*)(number) $400 -(const byte*) SRCA[] = (string) "camelot rules!" +(const byte*) SRCA[] = (byte*) "camelot rules!" (const byte*) SRCB[] = { (byte) $80 } (void()) main() (byte~) main::$0 @@ -860,7 +860,7 @@ FINAL SYMBOL TABLE (const byte*) DTV_FEATURE = (byte*) 53311 (const byte) DTV_FEATURE_ENABLE = (byte) 1 (const byte*) SCREEN = (byte*) 1024 -(const byte*) SRCA[] = (string) "camelot rules!" +(const byte*) SRCA[] = (byte*) "camelot rules!" (const byte*) SRCB[] = { (byte) $80 } (void()) main() (byte~) main::$0 reg byte a 22.0 diff --git a/src/test/ref/c64dtv-blitter-box.sym b/src/test/ref/c64dtv-blitter-box.sym index 8d21131b2..ebb761681 100644 --- a/src/test/ref/c64dtv-blitter-box.sym +++ b/src/test/ref/c64dtv-blitter-box.sym @@ -43,7 +43,7 @@ (const byte*) DTV_FEATURE = (byte*) 53311 (const byte) DTV_FEATURE_ENABLE = (byte) 1 (const byte*) SCREEN = (byte*) 1024 -(const byte*) SRCA[] = (string) "camelot rules!" +(const byte*) SRCA[] = (byte*) "camelot rules!" (const byte*) SRCB[] = { (byte) $80 } (void()) main() (byte~) main::$0 reg byte a 22.0 diff --git a/src/test/ref/c64dtv-gfxexplorer.log b/src/test/ref/c64dtv-gfxexplorer.log index b81306b7c..a481f7347 100644 --- a/src/test/ref/c64dtv-gfxexplorer.log +++ b/src/test/ref/c64dtv-gfxexplorer.log @@ -3657,10 +3657,10 @@ SYMBOL TABLE SSA (const byte*) DTV_PLANEB_START_MI = (byte*)(number) $d04a (const byte*) DTV_PLANEB_STEP = (byte*)(number) $d04c (const byte*) FORM_CHARSET = (byte*)(number) $1800 -(const byte*) FORM_COLS[] = (string) "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa@ @aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa@ @ nnnnnnnnnnnn mmmmmmmmmm ooooooooo @ nnnnnnnnnnnn mmmmmmmmmm ooooooooo @ nnnnnnnnnnnn mmmmmmmmmm ooooooooo @ nnnnnnnnnnnn mmmmmmmmmm ooooooooo @ nnnnnnnnnnnn mmmmmmmmmm @ nnnnnnnnnnnn jjjjjjjjj @ nnnnnnnnnnnn mmmmmmmmmm jjjjjjjjj @ nnnnnnnnnnnn mmmmmmmmmm jjjjjjjjj @ nnnnnnnnnnnn mmmmmmmmmm jjjjjjjjj @ nnnnnnnnnnnn mmmmmmmmmm jjjjjjjjj @ nnnnnnnnnnnn mmmmmmmmmm jjjjjjjjj @ nnnnnnnnnnnn mmmmmmmmmm jjjjjjjjj @" +(const byte*) FORM_COLS[] = (byte*) "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa@ @aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa@ @ nnnnnnnnnnnn mmmmmmmmmm ooooooooo @ nnnnnnnnnnnn mmmmmmmmmm ooooooooo @ nnnnnnnnnnnn mmmmmmmmmm ooooooooo @ nnnnnnnnnnnn mmmmmmmmmm ooooooooo @ nnnnnnnnnnnn mmmmmmmmmm @ nnnnnnnnnnnn jjjjjjjjj @ nnnnnnnnnnnn mmmmmmmmmm jjjjjjjjj @ nnnnnnnnnnnn mmmmmmmmmm jjjjjjjjj @ nnnnnnnnnnnn mmmmmmmmmm jjjjjjjjj @ nnnnnnnnnnnn mmmmmmmmmm jjjjjjjjj @ nnnnnnnnnnnn mmmmmmmmmm jjjjjjjjj @ nnnnnnnnnnnn mmmmmmmmmm jjjjjjjjj @" (const signed byte) FORM_CURSOR_BLINK = (signed byte) $28 (const byte*) FORM_SCREEN = (byte*)(number) $400 -(const byte*) FORM_TEXT[] = (string) " C64 DTV Graphics Mode Explorer @ @ PRESET 0 Standard Charset @ @ CONTROL PLANE A VIC II @ bmm 0 pattern p0 screen s0 @ mcm 0 start 00 gfx g0 @ ecm 0 step 00 colors c0 @ hicolor 0 modulo 00 @ linear 0 COLORS @ color off 0 PLANE B palet 0 @ chunky 0 pattern p0 bgcol0 00 @ border off 0 start 00 bgcol1 00 @ overscan 0 step 00 bgcol2 00 @ modulo 00 bgcol3 00 @" +(const byte*) FORM_TEXT[] = (byte*) " C64 DTV Graphics Mode Explorer @ @ PRESET 0 Standard Charset @ @ CONTROL PLANE A VIC II @ bmm 0 pattern p0 screen s0 @ mcm 0 start 00 gfx g0 @ ecm 0 step 00 colors c0 @ hicolor 0 modulo 00 @ linear 0 COLORS @ color off 0 PLANE B palet 0 @ chunky 0 pattern p0 bgcol0 00 @ border off 0 start 00 bgcol1 00 @ overscan 0 step 00 bgcol2 00 @ modulo 00 bgcol3 00 @" (const byte) KEY_COMMODORE = (byte) $3d (const byte) KEY_CRSR_DOWN = (byte) 7 (const byte) KEY_CRSR_RIGHT = (byte) 2 @@ -6064,7 +6064,7 @@ SYMBOL TABLE SSA (void()) print_cls() (label) print_cls::@1 (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#0 (byte*) print_line_cursor#1 @@ -6240,19 +6240,19 @@ SYMBOL TABLE SSA (bool~) render_preset_name::$0 (bool~) render_preset_name::$1 (bool~) render_preset_name::$10 -(const byte*) render_preset_name::$12[(byte) $1f] = (string) "Standard Charset " -(const byte*) render_preset_name::$13[(byte) $1f] = (string) "Extended Color Charset " -(const byte*) render_preset_name::$14[(byte) $1f] = (string) "Standard Bitmap " -(const byte*) render_preset_name::$15[(byte) $1f] = (string) "Multicolor Bitmap " -(const byte*) render_preset_name::$16[(byte) $1f] = (string) "Hicolor Charset " -(const byte*) render_preset_name::$17[(byte) $1f] = (string) "Hicolor Extended Color Charset" -(const byte*) render_preset_name::$18[(byte) $1f] = (string) "Twoplane Bitmap " -(const byte*) render_preset_name::$19[(byte) $1f] = (string) "Chunky 8bpp " +(const byte*) render_preset_name::$12[(byte) $1f] = (byte*) "Standard Charset " +(const byte*) render_preset_name::$13[(byte) $1f] = (byte*) "Extended Color Charset " +(const byte*) render_preset_name::$14[(byte) $1f] = (byte*) "Standard Bitmap " +(const byte*) render_preset_name::$15[(byte) $1f] = (byte*) "Multicolor Bitmap " +(const byte*) render_preset_name::$16[(byte) $1f] = (byte*) "Hicolor Charset " +(const byte*) render_preset_name::$17[(byte) $1f] = (byte*) "Hicolor Extended Color Charset" +(const byte*) render_preset_name::$18[(byte) $1f] = (byte*) "Twoplane Bitmap " +(const byte*) render_preset_name::$19[(byte) $1f] = (byte*) "Chunky 8bpp " (bool~) render_preset_name::$2 -(const byte*) render_preset_name::$20[(byte) $1f] = (string) "Sixs Fred " -(const byte*) render_preset_name::$21[(byte) $1f] = (string) "Sixs Fred 2 " -(const byte*) render_preset_name::$22[(byte) $1f] = (string) "8bpp Pixel Cell " -(const byte*) render_preset_name::$23[(byte) $1f] = (string) "Standard Charset " +(const byte*) render_preset_name::$20[(byte) $1f] = (byte*) "Sixs Fred " +(const byte*) render_preset_name::$21[(byte) $1f] = (byte*) "Sixs Fred 2 " +(const byte*) render_preset_name::$22[(byte) $1f] = (byte*) "8bpp Pixel Cell " +(const byte*) render_preset_name::$23[(byte) $1f] = (byte*) "Standard Charset " (bool~) render_preset_name::$3 (bool~) render_preset_name::$4 (bool~) render_preset_name::$5 @@ -27037,10 +27037,10 @@ FINAL SYMBOL TABLE (const byte*) DTV_PLANEB_START_MI = (byte*) 53322 (const byte*) DTV_PLANEB_STEP = (byte*) 53324 (const byte*) FORM_CHARSET = (byte*) 6144 -(const byte*) FORM_COLS[] = (string) "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa@ @aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa@ @ nnnnnnnnnnnn mmmmmmmmmm ooooooooo @ nnnnnnnnnnnn mmmmmmmmmm ooooooooo @ nnnnnnnnnnnn mmmmmmmmmm ooooooooo @ nnnnnnnnnnnn mmmmmmmmmm ooooooooo @ nnnnnnnnnnnn mmmmmmmmmm @ nnnnnnnnnnnn jjjjjjjjj @ nnnnnnnnnnnn mmmmmmmmmm jjjjjjjjj @ nnnnnnnnnnnn mmmmmmmmmm jjjjjjjjj @ nnnnnnnnnnnn mmmmmmmmmm jjjjjjjjj @ nnnnnnnnnnnn mmmmmmmmmm jjjjjjjjj @ nnnnnnnnnnnn mmmmmmmmmm jjjjjjjjj @ nnnnnnnnnnnn mmmmmmmmmm jjjjjjjjj @" +(const byte*) FORM_COLS[] = (byte*) "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa@ @aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa@ @ nnnnnnnnnnnn mmmmmmmmmm ooooooooo @ nnnnnnnnnnnn mmmmmmmmmm ooooooooo @ nnnnnnnnnnnn mmmmmmmmmm ooooooooo @ nnnnnnnnnnnn mmmmmmmmmm ooooooooo @ nnnnnnnnnnnn mmmmmmmmmm @ nnnnnnnnnnnn jjjjjjjjj @ nnnnnnnnnnnn mmmmmmmmmm jjjjjjjjj @ nnnnnnnnnnnn mmmmmmmmmm jjjjjjjjj @ nnnnnnnnnnnn mmmmmmmmmm jjjjjjjjj @ nnnnnnnnnnnn mmmmmmmmmm jjjjjjjjj @ nnnnnnnnnnnn mmmmmmmmmm jjjjjjjjj @ nnnnnnnnnnnn mmmmmmmmmm jjjjjjjjj @" (const signed byte) FORM_CURSOR_BLINK = (signed byte) $28 (const byte*) FORM_SCREEN = (byte*) 1024 -(const byte*) FORM_TEXT[] = (string) " C64 DTV Graphics Mode Explorer @ @ PRESET 0 Standard Charset @ @ CONTROL PLANE A VIC II @ bmm 0 pattern p0 screen s0 @ mcm 0 start 00 gfx g0 @ ecm 0 step 00 colors c0 @ hicolor 0 modulo 00 @ linear 0 COLORS @ color off 0 PLANE B palet 0 @ chunky 0 pattern p0 bgcol0 00 @ border off 0 start 00 bgcol1 00 @ overscan 0 step 00 bgcol2 00 @ modulo 00 bgcol3 00 @" +(const byte*) FORM_TEXT[] = (byte*) " C64 DTV Graphics Mode Explorer @ @ PRESET 0 Standard Charset @ @ CONTROL PLANE A VIC II @ bmm 0 pattern p0 screen s0 @ mcm 0 start 00 gfx g0 @ ecm 0 step 00 colors c0 @ hicolor 0 modulo 00 @ linear 0 COLORS @ color off 0 PLANE B palet 0 @ chunky 0 pattern p0 bgcol0 00 @ border off 0 start 00 bgcol1 00 @ overscan 0 step 00 bgcol2 00 @ modulo 00 bgcol3 00 @" (const byte) KEY_COMMODORE = (byte) $3d (const byte) KEY_CRSR_DOWN = (byte) 7 (const byte) KEY_CRSR_RIGHT = (byte) 2 @@ -28156,7 +28156,7 @@ FINAL SYMBOL TABLE (byte*) print_char_cursor#68 print_char_cursor zp[2]:11 202.0 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#2 print_line_cursor zp[2]:14 8.749999999999998 (byte*) print_line_cursor#21 print_line_cursor zp[2]:14 2004.0 @@ -28214,18 +28214,18 @@ FINAL SYMBOL TABLE (byte) render_preset_name::idx#1 reg byte a 202.0 (byte) render_preset_name::idx#10 reg byte a 11.363636363636362 (byte*) render_preset_name::name -(const byte*) render_preset_name::name#1 name_1 = (string) "Standard Charset " -(const byte*) render_preset_name::name#10 name_10 = (string) "Sixs Fred 2 " -(const byte*) render_preset_name::name#11 name_11 = (string) "8bpp Pixel Cell " +(const byte*) render_preset_name::name#1 name_1 = (byte*) "Standard Charset " +(const byte*) render_preset_name::name#10 name_10 = (byte*) "Sixs Fred 2 " +(const byte*) render_preset_name::name#11 name_11 = (byte*) "8bpp Pixel Cell " (byte*) render_preset_name::name#13 name zp[2]:6 2.0 -(const byte*) render_preset_name::name#2 name_2 = (string) "Extended Color Charset " -(const byte*) render_preset_name::name#3 name_3 = (string) "Standard Bitmap " -(const byte*) render_preset_name::name#4 name_4 = (string) "Multicolor Bitmap " -(const byte*) render_preset_name::name#5 name_5 = (string) "Hicolor Charset " -(const byte*) render_preset_name::name#6 name_6 = (string) "Hicolor Extended Color Charset" -(const byte*) render_preset_name::name#7 name_7 = (string) "Twoplane Bitmap " -(const byte*) render_preset_name::name#8 name_8 = (string) "Chunky 8bpp " -(const byte*) render_preset_name::name#9 name_9 = (string) "Sixs Fred " +(const byte*) render_preset_name::name#2 name_2 = (byte*) "Extended Color Charset " +(const byte*) render_preset_name::name#3 name_3 = (byte*) "Standard Bitmap " +(const byte*) render_preset_name::name#4 name_4 = (byte*) "Multicolor Bitmap " +(const byte*) render_preset_name::name#5 name_5 = (byte*) "Hicolor Charset " +(const byte*) render_preset_name::name#6 name_6 = (byte*) "Hicolor Extended Color Charset" +(const byte*) render_preset_name::name#7 name_7 = (byte*) "Twoplane Bitmap " +(const byte*) render_preset_name::name#8 name_8 = (byte*) "Chunky 8bpp " +(const byte*) render_preset_name::name#9 name_9 = (byte*) "Sixs Fred " reg byte x [ gfx_mode::dtv_control#12 gfx_mode::dtv_control#6 gfx_mode::dtv_control#13 gfx_mode::dtv_control#5 gfx_mode::dtv_control#11 gfx_mode::dtv_control#4 gfx_mode::dtv_control#10 gfx_mode::dtv_control#3 gfx_mode::dtv_control#15 gfx_mode::dtv_control#14 gfx_mode::dtv_control#2 ] reg byte x [ gfx_mode::vic_control#4 gfx_mode::vic_control#2 gfx_mode::vic_control#5 ] diff --git a/src/test/ref/c64dtv-gfxexplorer.sym b/src/test/ref/c64dtv-gfxexplorer.sym index 9b85ffa60..3b9bfd0ce 100644 --- a/src/test/ref/c64dtv-gfxexplorer.sym +++ b/src/test/ref/c64dtv-gfxexplorer.sym @@ -43,10 +43,10 @@ (const byte*) DTV_PLANEB_START_MI = (byte*) 53322 (const byte*) DTV_PLANEB_STEP = (byte*) 53324 (const byte*) FORM_CHARSET = (byte*) 6144 -(const byte*) FORM_COLS[] = (string) "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa@ @aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa@ @ nnnnnnnnnnnn mmmmmmmmmm ooooooooo @ nnnnnnnnnnnn mmmmmmmmmm ooooooooo @ nnnnnnnnnnnn mmmmmmmmmm ooooooooo @ nnnnnnnnnnnn mmmmmmmmmm ooooooooo @ nnnnnnnnnnnn mmmmmmmmmm @ nnnnnnnnnnnn jjjjjjjjj @ nnnnnnnnnnnn mmmmmmmmmm jjjjjjjjj @ nnnnnnnnnnnn mmmmmmmmmm jjjjjjjjj @ nnnnnnnnnnnn mmmmmmmmmm jjjjjjjjj @ nnnnnnnnnnnn mmmmmmmmmm jjjjjjjjj @ nnnnnnnnnnnn mmmmmmmmmm jjjjjjjjj @ nnnnnnnnnnnn mmmmmmmmmm jjjjjjjjj @" +(const byte*) FORM_COLS[] = (byte*) "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa@ @aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa@ @ nnnnnnnnnnnn mmmmmmmmmm ooooooooo @ nnnnnnnnnnnn mmmmmmmmmm ooooooooo @ nnnnnnnnnnnn mmmmmmmmmm ooooooooo @ nnnnnnnnnnnn mmmmmmmmmm ooooooooo @ nnnnnnnnnnnn mmmmmmmmmm @ nnnnnnnnnnnn jjjjjjjjj @ nnnnnnnnnnnn mmmmmmmmmm jjjjjjjjj @ nnnnnnnnnnnn mmmmmmmmmm jjjjjjjjj @ nnnnnnnnnnnn mmmmmmmmmm jjjjjjjjj @ nnnnnnnnnnnn mmmmmmmmmm jjjjjjjjj @ nnnnnnnnnnnn mmmmmmmmmm jjjjjjjjj @ nnnnnnnnnnnn mmmmmmmmmm jjjjjjjjj @" (const signed byte) FORM_CURSOR_BLINK = (signed byte) $28 (const byte*) FORM_SCREEN = (byte*) 1024 -(const byte*) FORM_TEXT[] = (string) " C64 DTV Graphics Mode Explorer @ @ PRESET 0 Standard Charset @ @ CONTROL PLANE A VIC II @ bmm 0 pattern p0 screen s0 @ mcm 0 start 00 gfx g0 @ ecm 0 step 00 colors c0 @ hicolor 0 modulo 00 @ linear 0 COLORS @ color off 0 PLANE B palet 0 @ chunky 0 pattern p0 bgcol0 00 @ border off 0 start 00 bgcol1 00 @ overscan 0 step 00 bgcol2 00 @ modulo 00 bgcol3 00 @" +(const byte*) FORM_TEXT[] = (byte*) " C64 DTV Graphics Mode Explorer @ @ PRESET 0 Standard Charset @ @ CONTROL PLANE A VIC II @ bmm 0 pattern p0 screen s0 @ mcm 0 start 00 gfx g0 @ ecm 0 step 00 colors c0 @ hicolor 0 modulo 00 @ linear 0 COLORS @ color off 0 PLANE B palet 0 @ chunky 0 pattern p0 bgcol0 00 @ border off 0 start 00 bgcol1 00 @ overscan 0 step 00 bgcol2 00 @ modulo 00 bgcol3 00 @" (const byte) KEY_COMMODORE = (byte) $3d (const byte) KEY_CRSR_DOWN = (byte) 7 (const byte) KEY_CRSR_RIGHT = (byte) 2 @@ -1162,7 +1162,7 @@ (byte*) print_char_cursor#68 print_char_cursor zp[2]:11 202.0 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#2 print_line_cursor zp[2]:14 8.749999999999998 (byte*) print_line_cursor#21 print_line_cursor zp[2]:14 2004.0 @@ -1220,18 +1220,18 @@ (byte) render_preset_name::idx#1 reg byte a 202.0 (byte) render_preset_name::idx#10 reg byte a 11.363636363636362 (byte*) render_preset_name::name -(const byte*) render_preset_name::name#1 name_1 = (string) "Standard Charset " -(const byte*) render_preset_name::name#10 name_10 = (string) "Sixs Fred 2 " -(const byte*) render_preset_name::name#11 name_11 = (string) "8bpp Pixel Cell " +(const byte*) render_preset_name::name#1 name_1 = (byte*) "Standard Charset " +(const byte*) render_preset_name::name#10 name_10 = (byte*) "Sixs Fred 2 " +(const byte*) render_preset_name::name#11 name_11 = (byte*) "8bpp Pixel Cell " (byte*) render_preset_name::name#13 name zp[2]:6 2.0 -(const byte*) render_preset_name::name#2 name_2 = (string) "Extended Color Charset " -(const byte*) render_preset_name::name#3 name_3 = (string) "Standard Bitmap " -(const byte*) render_preset_name::name#4 name_4 = (string) "Multicolor Bitmap " -(const byte*) render_preset_name::name#5 name_5 = (string) "Hicolor Charset " -(const byte*) render_preset_name::name#6 name_6 = (string) "Hicolor Extended Color Charset" -(const byte*) render_preset_name::name#7 name_7 = (string) "Twoplane Bitmap " -(const byte*) render_preset_name::name#8 name_8 = (string) "Chunky 8bpp " -(const byte*) render_preset_name::name#9 name_9 = (string) "Sixs Fred " +(const byte*) render_preset_name::name#2 name_2 = (byte*) "Extended Color Charset " +(const byte*) render_preset_name::name#3 name_3 = (byte*) "Standard Bitmap " +(const byte*) render_preset_name::name#4 name_4 = (byte*) "Multicolor Bitmap " +(const byte*) render_preset_name::name#5 name_5 = (byte*) "Hicolor Charset " +(const byte*) render_preset_name::name#6 name_6 = (byte*) "Hicolor Extended Color Charset" +(const byte*) render_preset_name::name#7 name_7 = (byte*) "Twoplane Bitmap " +(const byte*) render_preset_name::name#8 name_8 = (byte*) "Chunky 8bpp " +(const byte*) render_preset_name::name#9 name_9 = (byte*) "Sixs Fred " reg byte x [ gfx_mode::dtv_control#12 gfx_mode::dtv_control#6 gfx_mode::dtv_control#13 gfx_mode::dtv_control#5 gfx_mode::dtv_control#11 gfx_mode::dtv_control#4 gfx_mode::dtv_control#10 gfx_mode::dtv_control#3 gfx_mode::dtv_control#15 gfx_mode::dtv_control#14 gfx_mode::dtv_control#2 ] reg byte x [ gfx_mode::vic_control#4 gfx_mode::vic_control#2 gfx_mode::vic_control#5 ] diff --git a/src/test/ref/c64dtv-gfxmodes.log b/src/test/ref/c64dtv-gfxmodes.log index 33e64ba6f..4dbdad5fb 100644 --- a/src/test/ref/c64dtv-gfxmodes.log +++ b/src/test/ref/c64dtv-gfxmodes.log @@ -3121,7 +3121,7 @@ SYMBOL TABLE SSA (const byte) KEY_SPACE = (byte) $3c (const byte) KEY_U = (byte) $1e (const byte) LIGHT_GREEN = (byte) $d -(const byte*) MENU_TEXT[] = (string) "C64DTV Graphics Modes CCLHBME@ OHIIMCC@ LUNCMMM@----------------------------------------@1. Standard Char (V) 0000000@2. Extended Color Char (V) 0000001@3. Multicolor Char (V) 0000010@4. Standard Bitmap (V) 0000100@5. Multicolor Bitmap (V) 0000110@6. High Color Standard Char (H) 0001000@7. High Extended Color Char (H) 0001001@8. High Multicolor Char (H) 0001010@9. High Multicolor Bitmap (H) 0001110@a. Sixs Fred 2 (D) 0010111@b. Two Plane Bitmap (D) 0011101@c. Sixs Fred (2 Plane MC BM) (D) 0011111@d. 8bpp Pixel Cell (D) 0111011@e. Chunky 8bpp Bitmap (D) 1111011@----------------------------------------@ (V) vicII (H) vicII+hicol (D) c64dtv@" +(const byte*) MENU_TEXT[] = (byte*) "C64DTV Graphics Modes CCLHBME@ OHIIMCC@ LUNCMMM@----------------------------------------@1. Standard Char (V) 0000000@2. Extended Color Char (V) 0000001@3. Multicolor Char (V) 0000010@4. Standard Bitmap (V) 0000100@5. Multicolor Bitmap (V) 0000110@6. High Color Standard Char (H) 0001000@7. High Extended Color Char (H) 0001001@8. High Multicolor Char (H) 0001010@9. High Multicolor Bitmap (H) 0001110@a. Sixs Fred 2 (D) 0010111@b. Two Plane Bitmap (D) 0011101@c. Sixs Fred (2 Plane MC BM) (D) 0011111@d. 8bpp Pixel Cell (D) 0111011@e. Chunky 8bpp Bitmap (D) 1111011@----------------------------------------@ (V) vicII (H) vicII+hicol (D) c64dtv@" (const byte*) PROCPORT = (byte*)(number) 1 (const byte*) PROCPORT_DDR = (byte*)(number) 0 (const byte) PROCPORT_DDR_MEMORY_MASK = (byte) 7 @@ -24684,7 +24684,7 @@ FINAL SYMBOL TABLE (const byte) KEY_SPACE = (byte) $3c (const byte) KEY_U = (byte) $1e (const byte) LIGHT_GREEN = (byte) $d -(const byte*) MENU_TEXT[] = (string) "C64DTV Graphics Modes CCLHBME@ OHIIMCC@ LUNCMMM@----------------------------------------@1. Standard Char (V) 0000000@2. Extended Color Char (V) 0000001@3. Multicolor Char (V) 0000010@4. Standard Bitmap (V) 0000100@5. Multicolor Bitmap (V) 0000110@6. High Color Standard Char (H) 0001000@7. High Extended Color Char (H) 0001001@8. High Multicolor Char (H) 0001010@9. High Multicolor Bitmap (H) 0001110@a. Sixs Fred 2 (D) 0010111@b. Two Plane Bitmap (D) 0011101@c. Sixs Fred (2 Plane MC BM) (D) 0011111@d. 8bpp Pixel Cell (D) 0111011@e. Chunky 8bpp Bitmap (D) 1111011@----------------------------------------@ (V) vicII (H) vicII+hicol (D) c64dtv@" +(const byte*) MENU_TEXT[] = (byte*) "C64DTV Graphics Modes CCLHBME@ OHIIMCC@ LUNCMMM@----------------------------------------@1. Standard Char (V) 0000000@2. Extended Color Char (V) 0000001@3. Multicolor Char (V) 0000010@4. Standard Bitmap (V) 0000100@5. Multicolor Bitmap (V) 0000110@6. High Color Standard Char (H) 0001000@7. High Extended Color Char (H) 0001001@8. High Multicolor Char (H) 0001010@9. High Multicolor Bitmap (H) 0001110@a. Sixs Fred 2 (D) 0010111@b. Two Plane Bitmap (D) 0011101@c. Sixs Fred (2 Plane MC BM) (D) 0011111@d. 8bpp Pixel Cell (D) 0111011@e. Chunky 8bpp Bitmap (D) 1111011@----------------------------------------@ (V) vicII (H) vicII+hicol (D) c64dtv@" (const byte*) PROCPORT = (byte*) 1 (const byte*) PROCPORT_DDR = (byte*) 0 (const byte) PROCPORT_DDR_MEMORY_MASK = (byte) 7 diff --git a/src/test/ref/c64dtv-gfxmodes.sym b/src/test/ref/c64dtv-gfxmodes.sym index 1dc0b6652..1a7b5dc68 100644 --- a/src/test/ref/c64dtv-gfxmodes.sym +++ b/src/test/ref/c64dtv-gfxmodes.sym @@ -61,7 +61,7 @@ (const byte) KEY_SPACE = (byte) $3c (const byte) KEY_U = (byte) $1e (const byte) LIGHT_GREEN = (byte) $d -(const byte*) MENU_TEXT[] = (string) "C64DTV Graphics Modes CCLHBME@ OHIIMCC@ LUNCMMM@----------------------------------------@1. Standard Char (V) 0000000@2. Extended Color Char (V) 0000001@3. Multicolor Char (V) 0000010@4. Standard Bitmap (V) 0000100@5. Multicolor Bitmap (V) 0000110@6. High Color Standard Char (H) 0001000@7. High Extended Color Char (H) 0001001@8. High Multicolor Char (H) 0001010@9. High Multicolor Bitmap (H) 0001110@a. Sixs Fred 2 (D) 0010111@b. Two Plane Bitmap (D) 0011101@c. Sixs Fred (2 Plane MC BM) (D) 0011111@d. 8bpp Pixel Cell (D) 0111011@e. Chunky 8bpp Bitmap (D) 1111011@----------------------------------------@ (V) vicII (H) vicII+hicol (D) c64dtv@" +(const byte*) MENU_TEXT[] = (byte*) "C64DTV Graphics Modes CCLHBME@ OHIIMCC@ LUNCMMM@----------------------------------------@1. Standard Char (V) 0000000@2. Extended Color Char (V) 0000001@3. Multicolor Char (V) 0000010@4. Standard Bitmap (V) 0000100@5. Multicolor Bitmap (V) 0000110@6. High Color Standard Char (H) 0001000@7. High Extended Color Char (H) 0001001@8. High Multicolor Char (H) 0001010@9. High Multicolor Bitmap (H) 0001110@a. Sixs Fred 2 (D) 0010111@b. Two Plane Bitmap (D) 0011101@c. Sixs Fred (2 Plane MC BM) (D) 0011111@d. 8bpp Pixel Cell (D) 0111011@e. Chunky 8bpp Bitmap (D) 1111011@----------------------------------------@ (V) vicII (H) vicII+hicol (D) c64dtv@" (const byte*) PROCPORT = (byte*) 1 (const byte*) PROCPORT_DDR = (byte*) 0 (const byte) PROCPORT_DDR_MEMORY_MASK = (byte) 7 diff --git a/src/test/ref/cia-timer-cyclecount.log b/src/test/ref/cia-timer-cyclecount.log index 825610869..557a486e2 100644 --- a/src/test/ref/cia-timer-cyclecount.log +++ b/src/test/ref/cia-timer-cyclecount.log @@ -288,7 +288,7 @@ SYMBOL TABLE SSA (dword) print_dword_at::dw#0 (dword) print_dword_at::dw#1 (dword) print_dword_at::dw#2 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (void()) print_word_at((word) print_word_at::w , (byte*) print_word_at::at) (byte~) print_word_at::$0 (byte~) print_word_at::$2 @@ -1463,7 +1463,7 @@ FINAL SYMBOL TABLE (byte*) print_dword_at::at (dword) print_dword_at::dw (dword) print_dword_at::dw#0 dw zp[4]:9 5.0 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (void()) print_word_at((word) print_word_at::w , (byte*) print_word_at::at) (label) print_word_at::@1 (label) print_word_at::@return diff --git a/src/test/ref/cia-timer-cyclecount.sym b/src/test/ref/cia-timer-cyclecount.sym index 858e22476..886ad4314 100644 --- a/src/test/ref/cia-timer-cyclecount.sym +++ b/src/test/ref/cia-timer-cyclecount.sym @@ -55,7 +55,7 @@ (byte*) print_dword_at::at (dword) print_dword_at::dw (dword) print_dword_at::dw#0 dw zp[4]:9 5.0 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (void()) print_word_at((word) print_word_at::w , (byte*) print_word_at::at) (label) print_word_at::@1 (label) print_word_at::@return diff --git a/src/test/ref/cia-timer-simple.log b/src/test/ref/cia-timer-simple.log index dbd6b37d7..75cbc35f5 100644 --- a/src/test/ref/cia-timer-simple.log +++ b/src/test/ref/cia-timer-simple.log @@ -281,7 +281,7 @@ SYMBOL TABLE SSA (dword) print_dword_at::dw#0 (dword) print_dword_at::dw#1 (dword) print_dword_at::dw#2 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (void()) print_word_at((word) print_word_at::w , (byte*) print_word_at::at) (byte~) print_word_at::$0 (byte~) print_word_at::$2 @@ -1370,7 +1370,7 @@ FINAL SYMBOL TABLE (byte*) print_dword_at::at (dword) print_dword_at::dw (dword) print_dword_at::dw#0 dw zp[4]:9 5.0 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (void()) print_word_at((word) print_word_at::w , (byte*) print_word_at::at) (label) print_word_at::@1 (label) print_word_at::@return diff --git a/src/test/ref/cia-timer-simple.sym b/src/test/ref/cia-timer-simple.sym index ed250d92b..9ce6a8665 100644 --- a/src/test/ref/cia-timer-simple.sym +++ b/src/test/ref/cia-timer-simple.sym @@ -50,7 +50,7 @@ (byte*) print_dword_at::at (dword) print_dword_at::dw (dword) print_dword_at::dw#0 dw zp[4]:9 5.0 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (void()) print_word_at((word) print_word_at::w , (byte*) print_word_at::at) (label) print_word_at::@1 (label) print_word_at::@return diff --git a/src/test/ref/comparison-rewriting.log b/src/test/ref/comparison-rewriting.log index 3d5103bf2..f3a5e22e2 100644 --- a/src/test/ref/comparison-rewriting.log +++ b/src/test/ref/comparison-rewriting.log @@ -167,7 +167,7 @@ SYMBOL TABLE SSA (label) main::@5 (label) main::@9 (label) main::@return -(const byte*) main::header[] = (string) " < <= == >= >" +(const byte*) main::header[] = (byte*) " < <= == >= >" (byte) main::i (byte) main::i#0 (byte) main::i#1 @@ -1011,7 +1011,7 @@ FINAL SYMBOL TABLE (label) main::@8 (label) main::@9 (label) main::@return -(const byte*) main::header[] = (string) " < <= == >= >" +(const byte*) main::header[] = (byte*) " < <= == >= >" (byte) main::i (byte) main::i#1 reg byte x 22.0 (byte) main::i#2 reg byte x 18.333333333333332 diff --git a/src/test/ref/comparison-rewriting.sym b/src/test/ref/comparison-rewriting.sym index 263532c7a..d7163e84a 100644 --- a/src/test/ref/comparison-rewriting.sym +++ b/src/test/ref/comparison-rewriting.sym @@ -19,7 +19,7 @@ (label) main::@8 (label) main::@9 (label) main::@return -(const byte*) main::header[] = (string) " < <= == >= >" +(const byte*) main::header[] = (byte*) " < <= == >= >" (byte) main::i (byte) main::i#1 reg byte x 22.0 (byte) main::i#2 reg byte x 18.333333333333332 diff --git a/src/test/ref/complex/ataritempest/ataritempest.log b/src/test/ref/complex/ataritempest/ataritempest.log index d56164a66..f3b7860dc 100644 --- a/src/test/ref/complex/ataritempest/ataritempest.log +++ b/src/test/ref/complex/ataritempest/ataritempest.log @@ -50,7 +50,7 @@ SYMBOL TABLE SSA (label) @begin (label) @end (const byte*) BGCOL = (byte*)(number) $c01a -(const byte*) MESSAGE[] = (string) "hello world" +(const byte*) MESSAGE[] = (byte*) "hello world" (const byte*) SCREEN[(number) $32] = { fill( $32, 0) } (const void()**) VECTORS[] = { &interrupt(HARDWARE_ALL)(void()) nmiHandler(), &(void()) entryPoint() } (void()) entryPoint() @@ -408,7 +408,7 @@ FINAL SYMBOL TABLE (label) @begin (label) @end (const byte*) BGCOL = (byte*) 49178 -(const byte*) MESSAGE[] = (string) "hello world" +(const byte*) MESSAGE[] = (byte*) "hello world" (const byte*) SCREEN[(number) $32] = { fill( $32, 0) } (const void()**) VECTORS[] = { &interrupt(HARDWARE_ALL)(void()) nmiHandler(), &(void()) entryPoint() } (void()) entryPoint() diff --git a/src/test/ref/complex/ataritempest/ataritempest.sym b/src/test/ref/complex/ataritempest/ataritempest.sym index 26f1b7b56..5519292a8 100644 --- a/src/test/ref/complex/ataritempest/ataritempest.sym +++ b/src/test/ref/complex/ataritempest/ataritempest.sym @@ -2,7 +2,7 @@ (label) @begin (label) @end (const byte*) BGCOL = (byte*) 49178 -(const byte*) MESSAGE[] = (string) "hello world" +(const byte*) MESSAGE[] = (byte*) "hello world" (const byte*) SCREEN[(number) $32] = { fill( $32, 0) } (const void()**) VECTORS[] = { &interrupt(HARDWARE_ALL)(void()) nmiHandler(), &(void()) entryPoint() } (void()) entryPoint() diff --git a/src/test/ref/complex/xmega65/xmega65.log b/src/test/ref/complex/xmega65/xmega65.log index 96b47489d..cc64586fa 100644 --- a/src/test/ref/complex/xmega65/xmega65.log +++ b/src/test/ref/complex/xmega65/xmega65.log @@ -156,7 +156,7 @@ SYMBOL TABLE SSA (const byte) BLACK = (byte) 0 (const byte*) COLS = (byte*)(number) $d800 (const byte) JMP = (byte) $4c -(const byte*) MESSAGE[] = (string) "hello world!" +(const byte*) MESSAGE[] = (byte*) "hello world!" (const byte) NOP = (byte) $ea (const byte*) RASTER = (byte*)(number) $d012 (const byte*) SCREEN = (byte*)(number) $400 @@ -1134,7 +1134,7 @@ FINAL SYMBOL TABLE (const byte) BLACK = (byte) 0 (const byte*) COLS = (byte*) 55296 (const byte) JMP = (byte) $4c -(const byte*) MESSAGE[] = (string) "hello world!" +(const byte*) MESSAGE[] = (byte*) "hello world!" (const byte) NOP = (byte) $ea (const byte*) RASTER = (byte*) 53266 (const byte*) SCREEN = (byte*) 1024 diff --git a/src/test/ref/complex/xmega65/xmega65.sym b/src/test/ref/complex/xmega65/xmega65.sym index 907ae40d9..a92d54923 100644 --- a/src/test/ref/complex/xmega65/xmega65.sym +++ b/src/test/ref/complex/xmega65/xmega65.sym @@ -5,7 +5,7 @@ (const byte) BLACK = (byte) 0 (const byte*) COLS = (byte*) 55296 (const byte) JMP = (byte) $4c -(const byte*) MESSAGE[] = (string) "hello world!" +(const byte*) MESSAGE[] = (byte*) "hello world!" (const byte) NOP = (byte) $ea (const byte*) RASTER = (byte*) 53266 (const byte*) SCREEN = (byte*) 1024 diff --git a/src/test/ref/constant-string-concat-0.log b/src/test/ref/constant-string-concat-0.log index 2f9d84c28..6c0765485 100644 --- a/src/test/ref/constant-string-concat-0.log +++ b/src/test/ref/constant-string-concat-0.log @@ -48,7 +48,7 @@ SYMBOL TABLE SSA (byte) main::i#1 (byte) main::i#2 (byte) main::i#3 -(const byte*) main::msg[] = (string) "camelot" +(const byte*) main::msg[] = (byte*) "camelot" Adding number conversion cast (unumber) 0 in (bool~) main::$0 ← *((const byte*) main::msg + (byte) main::i#2) != (number) 0 Successful SSA optimization PassNAddNumberTypeConversions @@ -296,7 +296,7 @@ FINAL SYMBOL TABLE (byte) main::i (byte) main::i#1 reg byte x 22.0 (byte) main::i#2 reg byte x 18.333333333333332 -(const byte*) main::msg[] = (string) "camelot" +(const byte*) main::msg[] = (byte*) "camelot" reg byte x [ main::i#2 main::i#1 ] diff --git a/src/test/ref/constant-string-concat-0.sym b/src/test/ref/constant-string-concat-0.sym index 0094f556e..25e4a89b9 100644 --- a/src/test/ref/constant-string-concat-0.sym +++ b/src/test/ref/constant-string-concat-0.sym @@ -9,6 +9,6 @@ (byte) main::i (byte) main::i#1 reg byte x 22.0 (byte) main::i#2 reg byte x 18.333333333333332 -(const byte*) main::msg[] = (string) "camelot" +(const byte*) main::msg[] = (byte*) "camelot" reg byte x [ main::i#2 main::i#1 ] diff --git a/src/test/ref/constant-string-concat.log b/src/test/ref/constant-string-concat.log index f60f43e8c..3f893d1dd 100644 --- a/src/test/ref/constant-string-concat.log +++ b/src/test/ref/constant-string-concat.log @@ -40,7 +40,7 @@ SYMBOL TABLE SSA (byte) main::i#0 (byte) main::i#1 (byte) main::i#2 -(const byte*) main::s[] = (string) "camelot" +(const byte*) main::s[] = (byte*) "camelot" Simplifying constant pointer cast (byte*) 1024 Successful SSA optimization PassNCastSimplification @@ -283,7 +283,7 @@ FINAL SYMBOL TABLE (byte) main::i (byte) main::i#1 reg byte x 16.5 (byte) main::i#2 reg byte x 22.0 -(const byte*) main::s[] = (string) "camelot" +(const byte*) main::s[] = (byte*) "camelot" reg byte x [ main::i#2 main::i#1 ] diff --git a/src/test/ref/constant-string-concat.sym b/src/test/ref/constant-string-concat.sym index 403ca7084..6d0102781 100644 --- a/src/test/ref/constant-string-concat.sym +++ b/src/test/ref/constant-string-concat.sym @@ -8,6 +8,6 @@ (byte) main::i (byte) main::i#1 reg byte x 16.5 (byte) main::i#2 reg byte x 22.0 -(const byte*) main::s[] = (string) "camelot" +(const byte*) main::s[] = (byte*) "camelot" reg byte x [ main::i#2 main::i#1 ] diff --git a/src/test/ref/constants.log b/src/test/ref/constants.log index df232543d..5e262b6cf 100644 --- a/src/test/ref/constants.log +++ b/src/test/ref/constants.log @@ -543,9 +543,9 @@ SYMBOL TABLE SSA (byte*) assert_byte::msg#1 (byte*) assert_byte::msg#2 (byte*) assert_byte::msg#3 -(const byte*) assert_byte::str[(byte) 2] = (string) " " -(const byte*) assert_byte::str1[(byte) 6] = (string) "fail!" -(const byte*) assert_byte::str2[(byte) 3] = (string) "ok" +(const byte*) assert_byte::str[(byte) 2] = (byte*) " " +(const byte*) assert_byte::str1[(byte) 6] = (byte*) "fail!" +(const byte*) assert_byte::str2[(byte) 3] = (byte*) "ok" (void()) assert_sbyte((byte*) assert_sbyte::msg , (signed byte) assert_sbyte::b , (signed byte) assert_sbyte::c) (bool~) assert_sbyte::$2 (label) assert_sbyte::@1 @@ -582,9 +582,9 @@ SYMBOL TABLE SSA (byte*) assert_sbyte::msg#3 (byte*) assert_sbyte::msg#4 (byte*) assert_sbyte::msg#5 -(const byte*) assert_sbyte::str[(byte) 2] = (string) " " -(const byte*) assert_sbyte::str1[(byte) 6] = (string) "fail!" -(const byte*) assert_sbyte::str2[(byte) 3] = (string) "ok" +(const byte*) assert_sbyte::str[(byte) 2] = (byte*) " " +(const byte*) assert_sbyte::str1[(byte) 6] = (byte*) "fail!" +(const byte*) assert_sbyte::str2[(byte) 3] = (byte*) "ok" (void()) main() (label) main::@1 (label) main::@2 @@ -831,9 +831,9 @@ SYMBOL TABLE SSA (byte) test_bytes::bc#1 (byte) test_bytes::bd (byte) test_bytes::bd#0 -(const byte*) test_bytes::msg[(byte) 4] = (string) "0=0" -(const byte*) test_bytes::msg1[(byte) 6] = (string) "0+2=2" -(const byte*) test_bytes::msg2[(byte) $a] = (string) "0+2-4=254" +(const byte*) test_bytes::msg[(byte) 4] = (byte*) "0=0" +(const byte*) test_bytes::msg1[(byte) 6] = (byte*) "0+2=2" +(const byte*) test_bytes::msg2[(byte) $a] = (byte*) "0+2-4=254" (void()) test_sbytes() (number~) test_sbytes::$1 (number~) test_sbytes::$3 @@ -854,11 +854,11 @@ SYMBOL TABLE SSA (signed byte) test_sbytes::be (signed byte) test_sbytes::be#0 (const signed byte) test_sbytes::bf = (signed byte)(number) -$7f-(number) $7f -(const byte*) test_sbytes::msg[(byte) 4] = (string) "0=0" -(const byte*) test_sbytes::msg1[(byte) 6] = (string) "0+2=2" -(const byte*) test_sbytes::msg2[(byte) 9] = (string) "0+2-4=-2" -(const byte*) test_sbytes::msg3[(byte) $b] = (string) "-(0+2-4)=2" -(const byte*) test_sbytes::msg4[(byte) $b] = (string) "-127-127=2" +(const byte*) test_sbytes::msg[(byte) 4] = (byte*) "0=0" +(const byte*) test_sbytes::msg1[(byte) 6] = (byte*) "0+2=2" +(const byte*) test_sbytes::msg2[(byte) 9] = (byte*) "0+2-4=-2" +(const byte*) test_sbytes::msg3[(byte) $b] = (byte*) "-(0+2-4)=2" +(const byte*) test_sbytes::msg4[(byte) $b] = (byte*) "-127-127=2" Adding number conversion cast (unumber) 0 in (bool~) memset::$0 ← (word) memset::num#1 > (number) 0 Adding number conversion cast (unumber) 0 in (bool~) print_str::$0 ← (number) 0 != *((byte*) print_str::str#9) @@ -3026,8 +3026,8 @@ FINAL SYMBOL TABLE (void*) memset::return (void*) memset::str (const void*) memset::str#0 str = (void*)(byte*) 1024 -(const byte*) msg[(byte) 4] = (string) "0=0" -(const byte*) msg1[(byte) 6] = (string) "0+2=2" +(const byte*) msg[(byte) 4] = (byte*) "0=0" +(const byte*) msg1[(byte) 6] = (byte*) "0+2=2" (byte*) print_char_cursor (byte*) print_char_cursor#1 print_char_cursor zp[2]:2 11.0 (byte*) print_char_cursor#2 print_char_cursor zp[2]:2 2.230769230769231 @@ -3057,9 +3057,9 @@ FINAL SYMBOL TABLE (byte*) print_str::str#10 str zp[2]:7 11.5 (byte*) print_str::str#11 str zp[2]:7 6.0 (byte*) print_str::str#5 str zp[2]:7 2.0 -(const byte*) str[(byte) 2] = (string) " " -(const byte*) str1[(byte) 6] = (string) "fail!" -(const byte*) str2[(byte) 3] = (string) "ok" +(const byte*) str[(byte) 2] = (byte*) " " +(const byte*) str1[(byte) 6] = (byte*) "fail!" +(const byte*) str2[(byte) 3] = (byte*) "ok" (void()) test_bytes() (label) test_bytes::@1 (label) test_bytes::@2 @@ -3069,7 +3069,7 @@ FINAL SYMBOL TABLE (const byte) test_bytes::bc#0 bc = (byte) 2 (byte) test_bytes::bd (const byte) test_bytes::bd#0 bd = (byte)(signed byte)(const byte) test_bytes::bc#0-(signed byte) 4 -(const byte*) test_bytes::msg2[(byte) $a] = (string) "0+2-4=254" +(const byte*) test_bytes::msg2[(byte) $a] = (byte*) "0+2-4=254" (void()) test_sbytes() (label) test_sbytes::@1 (label) test_sbytes::@2 @@ -3084,9 +3084,9 @@ FINAL SYMBOL TABLE (signed byte) test_sbytes::be (const signed byte) test_sbytes::be#0 be = -(const signed byte) test_sbytes::bd#0 (const signed byte) test_sbytes::bf = (signed byte)(number) -$7f-(number) $7f -(const byte*) test_sbytes::msg2[(byte) 9] = (string) "0+2-4=-2" -(const byte*) test_sbytes::msg3[(byte) $b] = (string) "-(0+2-4)=2" -(const byte*) test_sbytes::msg4[(byte) $b] = (string) "-127-127=2" +(const byte*) test_sbytes::msg2[(byte) 9] = (byte*) "0+2-4=-2" +(const byte*) test_sbytes::msg3[(byte) $b] = (byte*) "-(0+2-4)=2" +(const byte*) test_sbytes::msg4[(byte) $b] = (byte*) "-127-127=2" reg byte x [ assert_sbyte::b#5 ] zp[2]:2 [ print_char_cursor#80 print_char_cursor#70 print_char_cursor#2 print_char_cursor#85 print_char_cursor#1 print_char_cursor#91 print_char_cursor#92 ] diff --git a/src/test/ref/constants.sym b/src/test/ref/constants.sym index 247ba0fd4..467ba754b 100644 --- a/src/test/ref/constants.sym +++ b/src/test/ref/constants.sym @@ -54,8 +54,8 @@ (void*) memset::return (void*) memset::str (const void*) memset::str#0 str = (void*)(byte*) 1024 -(const byte*) msg[(byte) 4] = (string) "0=0" -(const byte*) msg1[(byte) 6] = (string) "0+2=2" +(const byte*) msg[(byte) 4] = (byte*) "0=0" +(const byte*) msg1[(byte) 6] = (byte*) "0+2=2" (byte*) print_char_cursor (byte*) print_char_cursor#1 print_char_cursor zp[2]:2 11.0 (byte*) print_char_cursor#2 print_char_cursor zp[2]:2 2.230769230769231 @@ -85,9 +85,9 @@ (byte*) print_str::str#10 str zp[2]:7 11.5 (byte*) print_str::str#11 str zp[2]:7 6.0 (byte*) print_str::str#5 str zp[2]:7 2.0 -(const byte*) str[(byte) 2] = (string) " " -(const byte*) str1[(byte) 6] = (string) "fail!" -(const byte*) str2[(byte) 3] = (string) "ok" +(const byte*) str[(byte) 2] = (byte*) " " +(const byte*) str1[(byte) 6] = (byte*) "fail!" +(const byte*) str2[(byte) 3] = (byte*) "ok" (void()) test_bytes() (label) test_bytes::@1 (label) test_bytes::@2 @@ -97,7 +97,7 @@ (const byte) test_bytes::bc#0 bc = (byte) 2 (byte) test_bytes::bd (const byte) test_bytes::bd#0 bd = (byte)(signed byte)(const byte) test_bytes::bc#0-(signed byte) 4 -(const byte*) test_bytes::msg2[(byte) $a] = (string) "0+2-4=254" +(const byte*) test_bytes::msg2[(byte) $a] = (byte*) "0+2-4=254" (void()) test_sbytes() (label) test_sbytes::@1 (label) test_sbytes::@2 @@ -112,9 +112,9 @@ (signed byte) test_sbytes::be (const signed byte) test_sbytes::be#0 be = -(const signed byte) test_sbytes::bd#0 (const signed byte) test_sbytes::bf = (signed byte)(number) -$7f-(number) $7f -(const byte*) test_sbytes::msg2[(byte) 9] = (string) "0+2-4=-2" -(const byte*) test_sbytes::msg3[(byte) $b] = (string) "-(0+2-4)=2" -(const byte*) test_sbytes::msg4[(byte) $b] = (string) "-127-127=2" +(const byte*) test_sbytes::msg2[(byte) 9] = (byte*) "0+2-4=-2" +(const byte*) test_sbytes::msg3[(byte) $b] = (byte*) "-(0+2-4)=2" +(const byte*) test_sbytes::msg4[(byte) $b] = (byte*) "-127-127=2" reg byte x [ assert_sbyte::b#5 ] zp[2]:2 [ print_char_cursor#80 print_char_cursor#70 print_char_cursor#2 print_char_cursor#85 print_char_cursor#1 print_char_cursor#91 print_char_cursor#92 ] diff --git a/src/test/ref/cordic-atan2-16-ref.log b/src/test/ref/cordic-atan2-16-ref.log index 178456e39..d2ae3ca1f 100644 --- a/src/test/ref/cordic-atan2-16-ref.log +++ b/src/test/ref/cordic-atan2-16-ref.log @@ -1077,7 +1077,7 @@ SYMBOL TABLE SSA (byte*) print_char_cursor#7 (byte*) print_char_cursor#8 (byte*) print_char_cursor#9 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#0 (byte*) print_screen @@ -4560,7 +4560,7 @@ FINAL SYMBOL TABLE (byte*) print_char_cursor#18 print_char_cursor zp[2]:2 4.0 (byte*) print_char_cursor#19 print_char_cursor zp[2]:2 0.6666666666666666 (byte*) print_char_cursor#24 print_char_cursor zp[2]:2 1.3333333333333333 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_screen (void()) print_word((word) print_word::w) diff --git a/src/test/ref/cordic-atan2-16-ref.sym b/src/test/ref/cordic-atan2-16-ref.sym index d0785990d..c846f6de8 100644 --- a/src/test/ref/cordic-atan2-16-ref.sym +++ b/src/test/ref/cordic-atan2-16-ref.sym @@ -205,7 +205,7 @@ (byte*) print_char_cursor#18 print_char_cursor zp[2]:2 4.0 (byte*) print_char_cursor#19 print_char_cursor zp[2]:2 0.6666666666666666 (byte*) print_char_cursor#24 print_char_cursor zp[2]:2 1.3333333333333333 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_screen (void()) print_word((word) print_word::w) diff --git a/src/test/ref/declared-memory-var-4.log b/src/test/ref/declared-memory-var-4.log index d24914f5b..19c620955 100644 --- a/src/test/ref/declared-memory-var-4.log +++ b/src/test/ref/declared-memory-var-4.log @@ -52,7 +52,7 @@ SYMBOL TABLE SSA (const byte) OFFSET_STRUCT_FOO_THING1 = (byte) 0 (const byte) OFFSET_STRUCT_FOO_THING2 = (byte) 1 (const byte) OFFSET_STRUCT_FOO_THING3 = (byte) 2 -(struct foo) bar loadstore = { thing1: (byte) 'a', thing2: (byte) 'b', thing3: (string) "qwe" } +(struct foo) bar loadstore = { thing1: (byte) 'a', thing2: (byte) 'b', thing3: (byte*) "qwe" } (byte) foo::thing1 (byte) foo::thing2 (const byte*) foo::thing3[(number) $c] = { fill( $c, 0) } @@ -178,7 +178,7 @@ main::@return: scope:[main] from main::@1 VARIABLE REGISTER WEIGHTS -(struct foo) bar loadstore = { thing1: (byte) 'a', thing2: (byte) 'b', thing3: (string) "qwe" } +(struct foo) bar loadstore = { thing1: (byte) 'a', thing2: (byte) 'b', thing3: (byte*) "qwe" } (byte) foo::thing1 (byte) foo::thing2 (void()) main() @@ -404,7 +404,7 @@ FINAL SYMBOL TABLE (label) @end (const byte) OFFSET_STRUCT_FOO_THING2 = (byte) 1 (const byte) OFFSET_STRUCT_FOO_THING3 = (byte) 2 -(struct foo) bar loadstore mem[14] = { thing1: (byte) 'a', thing2: (byte) 'b', thing3: (string) "qwe" } +(struct foo) bar loadstore mem[14] = { thing1: (byte) 'a', thing2: (byte) 'b', thing3: (byte*) "qwe" } (byte) foo::thing1 (byte) foo::thing2 (const byte*) foo::thing3[(number) $c] = { fill( $c, 0) } diff --git a/src/test/ref/declared-memory-var-4.sym b/src/test/ref/declared-memory-var-4.sym index f94b9f8ce..022a7e341 100644 --- a/src/test/ref/declared-memory-var-4.sym +++ b/src/test/ref/declared-memory-var-4.sym @@ -3,7 +3,7 @@ (label) @end (const byte) OFFSET_STRUCT_FOO_THING2 = (byte) 1 (const byte) OFFSET_STRUCT_FOO_THING3 = (byte) 2 -(struct foo) bar loadstore mem[14] = { thing1: (byte) 'a', thing2: (byte) 'b', thing3: (string) "qwe" } +(struct foo) bar loadstore mem[14] = { thing1: (byte) 'a', thing2: (byte) 'b', thing3: (byte*) "qwe" } (byte) foo::thing1 (byte) foo::thing2 (const byte*) foo::thing3[(number) $c] = { fill( $c, 0) } diff --git a/src/test/ref/encoding-literal-char.log b/src/test/ref/encoding-literal-char.log index 09ef7c211..b31a30a82 100644 --- a/src/test/ref/encoding-literal-char.log +++ b/src/test/ref/encoding-literal-char.log @@ -57,10 +57,10 @@ SYMBOL TABLE SSA (byte) main::idx#8 (byte) main::idx#9 (const byte*) screen = (byte*)(number) $400 -(const byte*) spm[] = (string) "A"pm -(const byte*) spu[] = (string) "A"pu -(const byte*) ssm[] = (string) "A" -(const byte*) ssu[] = (string) "A"su +(const byte*) spm[] = (byte*) "A"pm +(const byte*) spu[] = (byte*) "A"pu +(const byte*) ssm[] = (byte*) "A" +(const byte*) ssu[] = (byte*) "A"su Adding number conversion cast (unumber) $28 in (byte) main::idx#5 ← (number) $28 Adding number conversion cast (unumber) 0 in *((const byte*) screen + (byte) main::idx#5) ← *((const byte*) spm + (number) 0) @@ -401,10 +401,10 @@ FINAL SYMBOL TABLE (label) main::@return (byte) main::idx (const byte*) screen = (byte*) 1024 -(const byte*) spm[] = (string) "A"pm -(const byte*) spu[] = (string) "A"pu -(const byte*) ssm[] = (string) "A" -(const byte*) ssu[] = (string) "A"su +(const byte*) spm[] = (byte*) "A"pm +(const byte*) spu[] = (byte*) "A"pu +(const byte*) ssm[] = (byte*) "A" +(const byte*) ssu[] = (byte*) "A"su diff --git a/src/test/ref/encoding-literal-char.sym b/src/test/ref/encoding-literal-char.sym index 33a108087..b7569ec44 100644 --- a/src/test/ref/encoding-literal-char.sym +++ b/src/test/ref/encoding-literal-char.sym @@ -9,8 +9,8 @@ (label) main::@return (byte) main::idx (const byte*) screen = (byte*) 1024 -(const byte*) spm[] = (string) "A"pm -(const byte*) spu[] = (string) "A"pu -(const byte*) ssm[] = (string) "A" -(const byte*) ssu[] = (string) "A"su +(const byte*) spm[] = (byte*) "A"pm +(const byte*) spu[] = (byte*) "A"pu +(const byte*) ssm[] = (byte*) "A" +(const byte*) ssu[] = (byte*) "A"su diff --git a/src/test/ref/euclid-3.log b/src/test/ref/euclid-3.log index 1beddd534..86e7fd319 100644 --- a/src/test/ref/euclid-3.log +++ b/src/test/ref/euclid-3.log @@ -611,7 +611,7 @@ SYMBOL TABLE SSA (byte) print_euclid::b#7 (byte) print_euclid::b#8 (byte) print_euclid::b#9 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#0 (byte*) print_line_cursor#1 @@ -2454,7 +2454,7 @@ FINAL SYMBOL TABLE (byte) print_euclid::a#10 a zp[1]:2 0.4444444444444444 (byte) print_euclid::b (byte) print_euclid::b#10 b zp[1]:3 0.4 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:6 3.533333333333333 (byte*) print_line_cursor#16 print_line_cursor zp[2]:6 24.0 diff --git a/src/test/ref/euclid-3.sym b/src/test/ref/euclid-3.sym index 722d07e64..c8cc6ed5a 100644 --- a/src/test/ref/euclid-3.sym +++ b/src/test/ref/euclid-3.sym @@ -85,7 +85,7 @@ (byte) print_euclid::a#10 a zp[1]:2 0.4444444444444444 (byte) print_euclid::b (byte) print_euclid::b#10 b zp[1]:3 0.4 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:6 3.533333333333333 (byte*) print_line_cursor#16 print_line_cursor zp[2]:6 24.0 diff --git a/src/test/ref/examples/3d/3d.log b/src/test/ref/examples/3d/3d.log index f30a93ae0..4cdd42db3 100644 --- a/src/test/ref/examples/3d/3d.log +++ b/src/test/ref/examples/3d/3d.log @@ -1701,18 +1701,18 @@ SYMBOL TABLE SSA (byte) debug_print_init::j#0 (byte) debug_print_init::j#1 (byte) debug_print_init::j#2 -(const byte*) debug_print_init::str[(byte) 3] = (string) "sx" -(const byte*) debug_print_init::str1[(byte) 3] = (string) "sy" -(const byte*) debug_print_init::str10[(byte) 3] = (string) "xp" -(const byte*) debug_print_init::str11[(byte) 3] = (string) "yp" -(const byte*) debug_print_init::str2[(byte) 3] = (string) "sz" -(const byte*) debug_print_init::str3[(byte) 2] = (string) "x" -(const byte*) debug_print_init::str4[(byte) 2] = (string) "y" -(const byte*) debug_print_init::str5[(byte) 2] = (string) "z" -(const byte*) debug_print_init::str6[(byte) 3] = (string) "xr" -(const byte*) debug_print_init::str7[(byte) 3] = (string) "yr" -(const byte*) debug_print_init::str8[(byte) 3] = (string) "zr" -(const byte*) debug_print_init::str9[(byte) 3] = (string) "pp" +(const byte*) debug_print_init::str[(byte) 3] = (byte*) "sx" +(const byte*) debug_print_init::str1[(byte) 3] = (byte*) "sy" +(const byte*) debug_print_init::str10[(byte) 3] = (byte*) "xp" +(const byte*) debug_print_init::str11[(byte) 3] = (byte*) "yp" +(const byte*) debug_print_init::str2[(byte) 3] = (byte*) "sz" +(const byte*) debug_print_init::str3[(byte) 2] = (byte*) "x" +(const byte*) debug_print_init::str4[(byte) 2] = (byte*) "y" +(const byte*) debug_print_init::str5[(byte) 2] = (byte*) "z" +(const byte*) debug_print_init::str6[(byte) 3] = (byte*) "xr" +(const byte*) debug_print_init::str7[(byte) 3] = (byte*) "yr" +(const byte*) debug_print_init::str8[(byte) 3] = (byte*) "zr" +(const byte*) debug_print_init::str9[(byte) 3] = (byte*) "pp" (void()) main() (word~) main::$1 (word~) main::$2 @@ -1808,7 +1808,7 @@ SYMBOL TABLE SSA (void()) print_cls() (label) print_cls::@1 (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (void()) print_sbyte_at((signed byte) print_sbyte_at::b , (byte*) print_sbyte_at::at) (bool~) print_sbyte_at::$0 (byte~) print_sbyte_at::$1 @@ -9364,18 +9364,18 @@ FINAL SYMBOL TABLE (byte) debug_print_init::j (byte) debug_print_init::j#1 reg byte y 151.5 (byte) debug_print_init::j#2 reg byte y 55.54999999999999 -(const byte*) debug_print_init::str[(byte) 3] = (string) "sx" -(const byte*) debug_print_init::str1[(byte) 3] = (string) "sy" -(const byte*) debug_print_init::str10[(byte) 3] = (string) "xp" -(const byte*) debug_print_init::str11[(byte) 3] = (string) "yp" -(const byte*) debug_print_init::str2[(byte) 3] = (string) "sz" -(const byte*) debug_print_init::str3[(byte) 2] = (string) "x" -(const byte*) debug_print_init::str4[(byte) 2] = (string) "y" -(const byte*) debug_print_init::str5[(byte) 2] = (string) "z" -(const byte*) debug_print_init::str6[(byte) 3] = (string) "xr" -(const byte*) debug_print_init::str7[(byte) 3] = (string) "yr" -(const byte*) debug_print_init::str8[(byte) 3] = (string) "zr" -(const byte*) debug_print_init::str9[(byte) 3] = (string) "pp" +(const byte*) debug_print_init::str[(byte) 3] = (byte*) "sx" +(const byte*) debug_print_init::str1[(byte) 3] = (byte*) "sy" +(const byte*) debug_print_init::str10[(byte) 3] = (byte*) "xp" +(const byte*) debug_print_init::str11[(byte) 3] = (byte*) "yp" +(const byte*) debug_print_init::str2[(byte) 3] = (byte*) "sz" +(const byte*) debug_print_init::str3[(byte) 2] = (byte*) "x" +(const byte*) debug_print_init::str4[(byte) 2] = (byte*) "y" +(const byte*) debug_print_init::str5[(byte) 2] = (byte*) "z" +(const byte*) debug_print_init::str6[(byte) 3] = (byte*) "xr" +(const byte*) debug_print_init::str7[(byte) 3] = (byte*) "yr" +(const byte*) debug_print_init::str8[(byte) 3] = (byte*) "zr" +(const byte*) debug_print_init::str9[(byte) 3] = (byte*) "pp" (void()) main() (label) main::@1 (label) main::@2 @@ -9433,7 +9433,7 @@ FINAL SYMBOL TABLE (byte) print_char_at::ch#4 reg byte y 6.0 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (void()) print_sbyte_at((signed byte) print_sbyte_at::b , (byte*) print_sbyte_at::at) (label) print_sbyte_at::@1 (label) print_sbyte_at::@2 diff --git a/src/test/ref/examples/3d/3d.sym b/src/test/ref/examples/3d/3d.sym index a75dd8a2f..4466e3d7f 100644 --- a/src/test/ref/examples/3d/3d.sym +++ b/src/test/ref/examples/3d/3d.sym @@ -274,18 +274,18 @@ (byte) debug_print_init::j (byte) debug_print_init::j#1 reg byte y 151.5 (byte) debug_print_init::j#2 reg byte y 55.54999999999999 -(const byte*) debug_print_init::str[(byte) 3] = (string) "sx" -(const byte*) debug_print_init::str1[(byte) 3] = (string) "sy" -(const byte*) debug_print_init::str10[(byte) 3] = (string) "xp" -(const byte*) debug_print_init::str11[(byte) 3] = (string) "yp" -(const byte*) debug_print_init::str2[(byte) 3] = (string) "sz" -(const byte*) debug_print_init::str3[(byte) 2] = (string) "x" -(const byte*) debug_print_init::str4[(byte) 2] = (string) "y" -(const byte*) debug_print_init::str5[(byte) 2] = (string) "z" -(const byte*) debug_print_init::str6[(byte) 3] = (string) "xr" -(const byte*) debug_print_init::str7[(byte) 3] = (string) "yr" -(const byte*) debug_print_init::str8[(byte) 3] = (string) "zr" -(const byte*) debug_print_init::str9[(byte) 3] = (string) "pp" +(const byte*) debug_print_init::str[(byte) 3] = (byte*) "sx" +(const byte*) debug_print_init::str1[(byte) 3] = (byte*) "sy" +(const byte*) debug_print_init::str10[(byte) 3] = (byte*) "xp" +(const byte*) debug_print_init::str11[(byte) 3] = (byte*) "yp" +(const byte*) debug_print_init::str2[(byte) 3] = (byte*) "sz" +(const byte*) debug_print_init::str3[(byte) 2] = (byte*) "x" +(const byte*) debug_print_init::str4[(byte) 2] = (byte*) "y" +(const byte*) debug_print_init::str5[(byte) 2] = (byte*) "z" +(const byte*) debug_print_init::str6[(byte) 3] = (byte*) "xr" +(const byte*) debug_print_init::str7[(byte) 3] = (byte*) "yr" +(const byte*) debug_print_init::str8[(byte) 3] = (byte*) "zr" +(const byte*) debug_print_init::str9[(byte) 3] = (byte*) "pp" (void()) main() (label) main::@1 (label) main::@2 @@ -343,7 +343,7 @@ (byte) print_char_at::ch#4 reg byte y 6.0 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (void()) print_sbyte_at((signed byte) print_sbyte_at::b , (byte*) print_sbyte_at::at) (label) print_sbyte_at::@1 (label) print_sbyte_at::@2 diff --git a/src/test/ref/examples/3d/perspective.log b/src/test/ref/examples/3d/perspective.log index ca64b9105..f33d7a91e 100644 --- a/src/test/ref/examples/3d/perspective.log +++ b/src/test/ref/examples/3d/perspective.log @@ -561,12 +561,12 @@ SYMBOL TABLE SSA (label) do_perspective::@8 (label) do_perspective::@9 (label) do_perspective::@return -(const byte*) do_perspective::str[(byte) 2] = (string) "(" -(const byte*) do_perspective::str1[(byte) 2] = (string) "," -(const byte*) do_perspective::str2[(byte) 2] = (string) "," -(const byte*) do_perspective::str3[(byte) 7] = (string) ") -> (" -(const byte*) do_perspective::str4[(byte) 2] = (string) "," -(const byte*) do_perspective::str5[(byte) 2] = (string) ")" +(const byte*) do_perspective::str[(byte) 2] = (byte*) "(" +(const byte*) do_perspective::str1[(byte) 2] = (byte*) "," +(const byte*) do_perspective::str2[(byte) 2] = (byte*) "," +(const byte*) do_perspective::str3[(byte) 7] = (byte*) ") -> (" +(const byte*) do_perspective::str4[(byte) 2] = (byte*) "," +(const byte*) do_perspective::str5[(byte) 2] = (byte*) ")" (signed byte) do_perspective::x (signed byte) do_perspective::x#0 (signed byte) do_perspective::x#1 @@ -785,7 +785,7 @@ SYMBOL TABLE SSA (void()) print_cls() (label) print_cls::@1 (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#0 (byte*) print_line_cursor#1 @@ -3348,10 +3348,10 @@ FINAL SYMBOL TABLE (label) do_perspective::@8 (label) do_perspective::@9 (label) do_perspective::@return -(const byte*) do_perspective::str[(byte) 2] = (string) "(" -(const byte*) do_perspective::str1[(byte) 2] = (string) "," -(const byte*) do_perspective::str3[(byte) 7] = (string) ") -> (" -(const byte*) do_perspective::str5[(byte) 2] = (string) ")" +(const byte*) do_perspective::str[(byte) 2] = (byte*) "(" +(const byte*) do_perspective::str1[(byte) 2] = (byte*) "," +(const byte*) do_perspective::str3[(byte) 7] = (byte*) ") -> (" +(const byte*) do_perspective::str5[(byte) 2] = (byte*) ")" (signed byte) do_perspective::x (const signed byte) do_perspective::x#0 x = (signed byte) $39 (signed byte) do_perspective::y @@ -3427,7 +3427,7 @@ FINAL SYMBOL TABLE (byte*) print_char_cursor#74 print_char_cursor zp[2]:4 12.0 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:2 16.5 (byte*) print_line_cursor#11 print_line_cursor zp[2]:2 22.0 diff --git a/src/test/ref/examples/3d/perspective.sym b/src/test/ref/examples/3d/perspective.sym index 935e4e6a3..8b70d5344 100644 --- a/src/test/ref/examples/3d/perspective.sym +++ b/src/test/ref/examples/3d/perspective.sym @@ -31,10 +31,10 @@ (label) do_perspective::@8 (label) do_perspective::@9 (label) do_perspective::@return -(const byte*) do_perspective::str[(byte) 2] = (string) "(" -(const byte*) do_perspective::str1[(byte) 2] = (string) "," -(const byte*) do_perspective::str3[(byte) 7] = (string) ") -> (" -(const byte*) do_perspective::str5[(byte) 2] = (string) ")" +(const byte*) do_perspective::str[(byte) 2] = (byte*) "(" +(const byte*) do_perspective::str1[(byte) 2] = (byte*) "," +(const byte*) do_perspective::str3[(byte) 7] = (byte*) ") -> (" +(const byte*) do_perspective::str5[(byte) 2] = (byte*) ")" (signed byte) do_perspective::x (const signed byte) do_perspective::x#0 x = (signed byte) $39 (signed byte) do_perspective::y @@ -110,7 +110,7 @@ (byte*) print_char_cursor#74 print_char_cursor zp[2]:4 12.0 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:2 16.5 (byte*) print_line_cursor#11 print_line_cursor zp[2]:2 22.0 diff --git a/src/test/ref/examples/chargen/chargen-analysis.log b/src/test/ref/examples/chargen/chargen-analysis.log index 6e43a525b..e6f93da3b 100644 --- a/src/test/ref/examples/chargen/chargen-analysis.log +++ b/src/test/ref/examples/chargen/chargen-analysis.log @@ -766,10 +766,10 @@ SYMBOL TABLE SSA (byte) main::shift#7 (byte) main::shift#8 (byte) main::shift#9 -(const byte*) main::str[(byte) 3] = (string) "f1" -(const byte*) main::str1[(byte) 3] = (string) "f3" -(const byte*) main::str2[(byte) 3] = (string) "f5" -(const byte*) main::str3[(byte) 3] = (string) "f7" +(const byte*) main::str[(byte) 3] = (byte*) "f1" +(const byte*) main::str1[(byte) 3] = (byte*) "f3" +(const byte*) main::str2[(byte) 3] = (byte*) "f5" +(const byte*) main::str3[(byte) 3] = (byte*) "f7" (word()) mul8u((byte) mul8u::a , (byte) mul8u::b) (bool~) mul8u::$0 (number~) mul8u::$1 @@ -4432,10 +4432,10 @@ FINAL SYMBOL TABLE (byte*) main::sc#2 sc zp[2]:6 14.666666666666666 (byte) main::shift (byte) main::shift#9 shift zp[1]:4 5.315789473684211 -(const byte*) main::str[(byte) 3] = (string) "f1" -(const byte*) main::str1[(byte) 3] = (string) "f3" -(const byte*) main::str2[(byte) 3] = (string) "f5" -(const byte*) main::str3[(byte) 3] = (string) "f7" +(const byte*) main::str[(byte) 3] = (byte*) "f1" +(const byte*) main::str1[(byte) 3] = (byte*) "f3" +(const byte*) main::str2[(byte) 3] = (byte*) "f5" +(const byte*) main::str3[(byte) 3] = (byte*) "f7" (word()) mul8u((byte) mul8u::a , (byte) mul8u::b) (byte~) mul8u::$1 reg byte a 2002.0 (label) mul8u::@1 diff --git a/src/test/ref/examples/chargen/chargen-analysis.sym b/src/test/ref/examples/chargen/chargen-analysis.sym index aa767f7d8..49a9fc0bc 100644 --- a/src/test/ref/examples/chargen/chargen-analysis.sym +++ b/src/test/ref/examples/chargen/chargen-analysis.sym @@ -157,10 +157,10 @@ (byte*) main::sc#2 sc zp[2]:6 14.666666666666666 (byte) main::shift (byte) main::shift#9 shift zp[1]:4 5.315789473684211 -(const byte*) main::str[(byte) 3] = (string) "f1" -(const byte*) main::str1[(byte) 3] = (string) "f3" -(const byte*) main::str2[(byte) 3] = (string) "f5" -(const byte*) main::str3[(byte) 3] = (string) "f7" +(const byte*) main::str[(byte) 3] = (byte*) "f1" +(const byte*) main::str1[(byte) 3] = (byte*) "f3" +(const byte*) main::str2[(byte) 3] = (byte*) "f5" +(const byte*) main::str3[(byte) 3] = (byte*) "f7" (word()) mul8u((byte) mul8u::a , (byte) mul8u::b) (byte~) mul8u::$1 reg byte a 2002.0 (label) mul8u::@1 diff --git a/src/test/ref/examples/fastmultiply/fastmultiply8.log b/src/test/ref/examples/fastmultiply/fastmultiply8.log index d1ab0d5bf..79f8a408a 100644 --- a/src/test/ref/examples/fastmultiply/fastmultiply8.log +++ b/src/test/ref/examples/fastmultiply/fastmultiply8.log @@ -558,7 +558,7 @@ SYMBOL TABLE SSA (void()) print_cls() (label) print_cls::@1 (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (void()) print_sbyte_at((signed byte) print_sbyte_at::b , (byte*) print_sbyte_at::at) (bool~) print_sbyte_at::$0 (byte~) print_sbyte_at::$1 @@ -2752,7 +2752,7 @@ FINAL SYMBOL TABLE (byte) print_char_at::ch#4 ch zp[1]:9 6.0 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (void()) print_sbyte_at((signed byte) print_sbyte_at::b , (byte*) print_sbyte_at::at) (label) print_sbyte_at::@1 (label) print_sbyte_at::@2 diff --git a/src/test/ref/examples/fastmultiply/fastmultiply8.sym b/src/test/ref/examples/fastmultiply/fastmultiply8.sym index da7e370c8..3b59e4a2c 100644 --- a/src/test/ref/examples/fastmultiply/fastmultiply8.sym +++ b/src/test/ref/examples/fastmultiply/fastmultiply8.sym @@ -112,7 +112,7 @@ (byte) print_char_at::ch#4 ch zp[1]:9 6.0 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (void()) print_sbyte_at((signed byte) print_sbyte_at::b , (byte*) print_sbyte_at::at) (label) print_sbyte_at::@1 (label) print_sbyte_at::@2 diff --git a/src/test/ref/examples/helloworld/helloworld.log b/src/test/ref/examples/helloworld/helloworld.log index 87e2b8467..479d41039 100644 --- a/src/test/ref/examples/helloworld/helloworld.log +++ b/src/test/ref/examples/helloworld/helloworld.log @@ -163,7 +163,7 @@ SYMBOL TABLE SSA (label) main::@1 (label) main::@2 (label) main::@return -(const byte*) main::str[(byte) $d] = (string) "hello world!" +(const byte*) main::str[(byte) $d] = (byte*) "hello world!" (byte*) print_char_cursor (byte*) print_char_cursor#0 (byte*) print_char_cursor#1 @@ -751,7 +751,7 @@ FINAL SYMBOL TABLE (void()) main() (label) main::@1 (label) main::@return -(const byte*) main::str[(byte) $d] = (string) "hello world!" +(const byte*) main::str[(byte) $d] = (byte*) "hello world!" (byte*) print_char_cursor (byte*) print_char_cursor#1 print_char_cursor zp[2]:4 11.0 (byte*) print_char_cursor#10 print_char_cursor zp[2]:4 4.4 diff --git a/src/test/ref/examples/helloworld/helloworld.sym b/src/test/ref/examples/helloworld/helloworld.sym index 58c85bb04..a342483d2 100644 --- a/src/test/ref/examples/helloworld/helloworld.sym +++ b/src/test/ref/examples/helloworld/helloworld.sym @@ -8,7 +8,7 @@ (void()) main() (label) main::@1 (label) main::@return -(const byte*) main::str[(byte) $d] = (string) "hello world!" +(const byte*) main::str[(byte) $d] = (byte*) "hello world!" (byte*) print_char_cursor (byte*) print_char_cursor#1 print_char_cursor zp[2]:4 11.0 (byte*) print_char_cursor#10 print_char_cursor zp[2]:4 4.4 diff --git a/src/test/ref/examples/kernalload/kernalload.log b/src/test/ref/examples/kernalload/kernalload.log index 8fd5a5cec..a8795e607 100644 --- a/src/test/ref/examples/kernalload/kernalload.log +++ b/src/test/ref/examples/kernalload/kernalload.log @@ -283,7 +283,7 @@ SYMBOL TABLE SSA (label) main::@4 (label) main::@5 (label) main::@return -(const byte*) main::filename[(byte) 7] = (string) "SPRITE" +(const byte*) main::filename[(byte) 7] = (byte*) "SPRITE" (byte) main::status (byte) main::status#0 (byte) main::status#1 @@ -1557,7 +1557,7 @@ FINAL SYMBOL TABLE (label) main::@3 (label) main::@4 (label) main::@return -(const byte*) main::filename[(byte) 7] = (string) "SPRITE" +(const byte*) main::filename[(byte) 7] = (byte*) "SPRITE" (byte) main::status (byte) main::status#0 reg byte x 2.0 (label) main::toSpritePtr1 diff --git a/src/test/ref/examples/kernalload/kernalload.sym b/src/test/ref/examples/kernalload/kernalload.sym index fcbb045e5..4a5203dc0 100644 --- a/src/test/ref/examples/kernalload/kernalload.sym +++ b/src/test/ref/examples/kernalload/kernalload.sym @@ -49,7 +49,7 @@ (label) main::@3 (label) main::@4 (label) main::@return -(const byte*) main::filename[(byte) 7] = (string) "SPRITE" +(const byte*) main::filename[(byte) 7] = (byte*) "SPRITE" (byte) main::status (byte) main::status#0 reg byte x 2.0 (label) main::toSpritePtr1 diff --git a/src/test/ref/examples/rotate/rotate.log b/src/test/ref/examples/rotate/rotate.log index 0bd7269c6..a36627d6f 100644 --- a/src/test/ref/examples/rotate/rotate.log +++ b/src/test/ref/examples/rotate/rotate.log @@ -1132,7 +1132,7 @@ SYMBOL TABLE SSA (dword) print_dword_at::dw#0 (dword) print_dword_at::dw#1 (dword) print_dword_at::dw#2 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (void()) print_word_at((word) print_word_at::w , (byte*) print_word_at::at) (byte~) print_word_at::$0 (byte~) print_word_at::$2 @@ -5183,7 +5183,7 @@ FINAL SYMBOL TABLE (byte*) print_dword_at::at (dword) print_dword_at::dw (dword) print_dword_at::dw#0 dw zp[4]:19 5.0 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (void()) print_word_at((word) print_word_at::w , (byte*) print_word_at::at) (label) print_word_at::@1 (label) print_word_at::@return diff --git a/src/test/ref/examples/rotate/rotate.sym b/src/test/ref/examples/rotate/rotate.sym index eb3aea84a..1c16082d7 100644 --- a/src/test/ref/examples/rotate/rotate.sym +++ b/src/test/ref/examples/rotate/rotate.sym @@ -225,7 +225,7 @@ (byte*) print_dword_at::at (dword) print_dword_at::dw (dword) print_dword_at::dw#0 dw zp[4]:19 5.0 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (void()) print_word_at((word) print_word_at::w , (byte*) print_word_at::at) (label) print_word_at::@1 (label) print_word_at::@return diff --git a/src/test/ref/examples/scroll/scroll.log b/src/test/ref/examples/scroll/scroll.log index 7f3013c3d..4e92b6fa8 100644 --- a/src/test/ref/examples/scroll/scroll.log +++ b/src/test/ref/examples/scroll/scroll.log @@ -136,7 +136,7 @@ SYMBOL TABLE SSA (const byte*) RASTER = (byte*)(number) $d012 (const byte*) SCREEN = (byte*)(number) $400 (const byte*) SCROLL = (byte*)(number) $d016 -(const byte*) TEXT[] = (string) "-= this is rex of camelot testing a scroller created in kickc. kickc is an optimizing c-compiler for 6502 assembler. =- " +(const byte*) TEXT[] = (byte*) "-= this is rex of camelot testing a scroller created in kickc. kickc is an optimizing c-compiler for 6502 assembler. =- " (void()) fillscreen((byte*) fillscreen::screen , (byte) fillscreen::fill) (byte*~) fillscreen::$0 (bool~) fillscreen::$1 @@ -1006,7 +1006,7 @@ FINAL SYMBOL TABLE (const byte*) RASTER = (byte*) 53266 (const byte*) SCREEN = (byte*) 1024 (const byte*) SCROLL = (byte*) 53270 -(const byte*) TEXT[] = (string) "-= this is rex of camelot testing a scroller created in kickc. kickc is an optimizing c-compiler for 6502 assembler. =- " +(const byte*) TEXT[] = (byte*) "-= this is rex of camelot testing a scroller created in kickc. kickc is an optimizing c-compiler for 6502 assembler. =- " (void()) fillscreen((byte*) fillscreen::screen , (byte) fillscreen::fill) (label) fillscreen::@1 (label) fillscreen::@2 diff --git a/src/test/ref/examples/scroll/scroll.sym b/src/test/ref/examples/scroll/scroll.sym index d03870a39..5633db78f 100644 --- a/src/test/ref/examples/scroll/scroll.sym +++ b/src/test/ref/examples/scroll/scroll.sym @@ -5,7 +5,7 @@ (const byte*) RASTER = (byte*) 53266 (const byte*) SCREEN = (byte*) 1024 (const byte*) SCROLL = (byte*) 53270 -(const byte*) TEXT[] = (string) "-= this is rex of camelot testing a scroller created in kickc. kickc is an optimizing c-compiler for 6502 assembler. =- " +(const byte*) TEXT[] = (byte*) "-= this is rex of camelot testing a scroller created in kickc. kickc is an optimizing c-compiler for 6502 assembler. =- " (void()) fillscreen((byte*) fillscreen::screen , (byte) fillscreen::fill) (label) fillscreen::@1 (label) fillscreen::@2 diff --git a/src/test/ref/examples/scrollbig/scrollbig.log b/src/test/ref/examples/scrollbig/scrollbig.log index 95aba894b..51931308e 100644 --- a/src/test/ref/examples/scrollbig/scrollbig.log +++ b/src/test/ref/examples/scrollbig/scrollbig.log @@ -376,7 +376,7 @@ SYMBOL TABLE SSA (const byte*) RASTER = (byte*)(number) $d012 (const byte*) SCREEN = (byte*)(number) $400 (const byte*) SCROLL = (byte*)(number) $d016 -(const byte*) TEXT = (string) "-= this is rex of camelot testing a scroller created in kickc. kickc is an optimizing c-compiler for 6502 assembler. =- " +(const byte*) TEXT = (byte*) "-= this is rex of camelot testing a scroller created in kickc. kickc is an optimizing c-compiler for 6502 assembler. =- " (byte) current_bit (byte) current_bit#0 (byte) current_bit#1 @@ -2430,7 +2430,7 @@ FINAL SYMBOL TABLE (const byte*) RASTER = (byte*) 53266 (const byte*) SCREEN = (byte*) 1024 (const byte*) SCROLL = (byte*) 53270 -(const byte*) TEXT = (string) "-= this is rex of camelot testing a scroller created in kickc. kickc is an optimizing c-compiler for 6502 assembler. =- " +(const byte*) TEXT = (byte*) "-= this is rex of camelot testing a scroller created in kickc. kickc is an optimizing c-compiler for 6502 assembler. =- " (byte) current_bit (byte) current_bit#12 current_bit zp[1]:2 3.0 (byte) current_bit#21 current_bit zp[1]:2 5.833333333333333 diff --git a/src/test/ref/examples/scrollbig/scrollbig.sym b/src/test/ref/examples/scrollbig/scrollbig.sym index 8d9db9cf0..54c40f05f 100644 --- a/src/test/ref/examples/scrollbig/scrollbig.sym +++ b/src/test/ref/examples/scrollbig/scrollbig.sym @@ -7,7 +7,7 @@ (const byte*) RASTER = (byte*) 53266 (const byte*) SCREEN = (byte*) 1024 (const byte*) SCROLL = (byte*) 53270 -(const byte*) TEXT = (string) "-= this is rex of camelot testing a scroller created in kickc. kickc is an optimizing c-compiler for 6502 assembler. =- " +(const byte*) TEXT = (byte*) "-= this is rex of camelot testing a scroller created in kickc. kickc is an optimizing c-compiler for 6502 assembler. =- " (byte) current_bit (byte) current_bit#12 current_bit zp[1]:2 3.0 (byte) current_bit#21 current_bit zp[1]:2 5.833333333333333 diff --git a/src/test/ref/examples/sinsprites/sinus-sprites.log b/src/test/ref/examples/sinsprites/sinus-sprites.log index 4042ae5d9..5a1569e8d 100644 --- a/src/test/ref/examples/sinsprites/sinus-sprites.log +++ b/src/test/ref/examples/sinsprites/sinus-sprites.log @@ -1404,7 +1404,7 @@ SYMBOL TABLE SSA (label) gen_sprites::@1 (label) gen_sprites::@3 (label) gen_sprites::@return -(const byte*) gen_sprites::cml[] = (string) "camelot"z +(const byte*) gen_sprites::cml[] = (byte*) "camelot"z (byte) gen_sprites::i (byte) gen_sprites::i#0 (byte) gen_sprites::i#1 @@ -7247,7 +7247,7 @@ FINAL SYMBOL TABLE (label) gen_sprites::@1 (label) gen_sprites::@2 (label) gen_sprites::@return -(const byte*) gen_sprites::cml[] = (string) "camelot"z +(const byte*) gen_sprites::cml[] = (byte*) "camelot"z (byte) gen_sprites::i (byte) gen_sprites::i#1 i zp[1]:11 16.5 (byte) gen_sprites::i#2 i zp[1]:11 6.6000000000000005 diff --git a/src/test/ref/examples/sinsprites/sinus-sprites.sym b/src/test/ref/examples/sinsprites/sinus-sprites.sym index b5aa98c04..0284bb325 100644 --- a/src/test/ref/examples/sinsprites/sinus-sprites.sym +++ b/src/test/ref/examples/sinsprites/sinus-sprites.sym @@ -176,7 +176,7 @@ (label) gen_sprites::@1 (label) gen_sprites::@2 (label) gen_sprites::@return -(const byte*) gen_sprites::cml[] = (string) "camelot"z +(const byte*) gen_sprites::cml[] = (byte*) "camelot"z (byte) gen_sprites::i (byte) gen_sprites::i#1 i zp[1]:11 16.5 (byte) gen_sprites::i#2 i zp[1]:11 6.6000000000000005 diff --git a/src/test/ref/fastmultiply-127.log b/src/test/ref/fastmultiply-127.log index 53f57859b..99c4fb54d 100644 --- a/src/test/ref/fastmultiply-127.log +++ b/src/test/ref/fastmultiply-127.log @@ -846,8 +846,8 @@ SYMBOL TABLE SSA (label) main::@8 (label) main::@9 (label) main::@return -(const byte*) main::str[(byte) 9] = (string) "unsigned" -(const byte*) main::str1[(byte) 7] = (string) "signed" +(const byte*) main::str[(byte) 9] = (byte*) "unsigned" +(const byte*) main::str1[(byte) 7] = (byte*) "signed" (void*()) memset((void*) memset::str , (byte) memset::c , (word) memset::num) (bool~) memset::$0 (bool~) memset::$1 @@ -1148,7 +1148,7 @@ SYMBOL TABLE SSA (void()) print_cls() (label) print_cls::@1 (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#0 (byte*) print_line_cursor#1 @@ -5565,8 +5565,8 @@ FINAL SYMBOL TABLE (label) main::@8 (label) main::@9 (label) main::@return -(const byte*) main::str[(byte) 9] = (string) "unsigned" -(const byte*) main::str1[(byte) 7] = (string) "signed" +(const byte*) main::str[(byte) 9] = (byte*) "unsigned" +(const byte*) main::str1[(byte) 7] = (byte*) "signed" (void*()) memset((void*) memset::str , (byte) memset::c , (word) memset::num) (label) memset::@1 (label) memset::@2 @@ -5668,7 +5668,7 @@ FINAL SYMBOL TABLE (byte*) print_char_cursor#80 print_char_cursor zp[2]:7 12.0 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:5 0.5421686746987951 (byte*) print_line_cursor#32 print_line_cursor zp[2]:5 24.0 diff --git a/src/test/ref/fastmultiply-127.sym b/src/test/ref/fastmultiply-127.sym index de909b026..7d021fee1 100644 --- a/src/test/ref/fastmultiply-127.sym +++ b/src/test/ref/fastmultiply-127.sym @@ -29,8 +29,8 @@ (label) main::@8 (label) main::@9 (label) main::@return -(const byte*) main::str[(byte) 9] = (string) "unsigned" -(const byte*) main::str1[(byte) 7] = (string) "signed" +(const byte*) main::str[(byte) 9] = (byte*) "unsigned" +(const byte*) main::str1[(byte) 7] = (byte*) "signed" (void*()) memset((void*) memset::str , (byte) memset::c , (word) memset::num) (label) memset::@1 (label) memset::@2 @@ -132,7 +132,7 @@ (byte*) print_char_cursor#80 print_char_cursor zp[2]:7 12.0 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:5 0.5421686746987951 (byte*) print_line_cursor#32 print_line_cursor zp[2]:5 24.0 diff --git a/src/test/ref/function-pointer-noarg-call-10.log b/src/test/ref/function-pointer-noarg-call-10.log index a2f9e58ae..d87fab4a4 100644 --- a/src/test/ref/function-pointer-noarg-call-10.log +++ b/src/test/ref/function-pointer-noarg-call-10.log @@ -113,7 +113,7 @@ SYMBOL TABLE SSA (void()) hello() (label) hello::@1 (label) hello::@return -(const byte*) hello::msg[(byte) 7] = (string) "hello " +(const byte*) hello::msg[(byte) 7] = (byte*) "hello " (byte) idx loadstore (void()) main() (label) main::@1 @@ -135,7 +135,7 @@ SYMBOL TABLE SSA (void()) world() (label) world::@1 (label) world::@return -(const byte*) world::msg[(byte) 7] = (string) "world " +(const byte*) world::msg[(byte) 7] = (byte*) "world " Adding number conversion cast (unumber) 0 in (bool~) print::$0 ← (number) 0 != *((byte*) print::msg#2 + (byte) print::i#1) Successful SSA optimization PassNAddNumberTypeConversions @@ -774,7 +774,7 @@ FINAL SYMBOL TABLE (byte) do10::i#2 i zp[1]:4 11.0 (void()) hello() (label) hello::@return -(const byte*) hello::msg[(byte) 7] = (string) "hello " +(const byte*) hello::msg[(byte) 7] = (byte*) "hello " (byte) idx loadstore zp[1]:7 5.0 (void()) main() (label) main::@1 @@ -789,7 +789,7 @@ FINAL SYMBOL TABLE (byte*) print::msg#3 msg zp[2]:5 3.6666666666666665 (void()) world() (label) world::@return -(const byte*) world::msg[(byte) 7] = (string) "world " +(const byte*) world::msg[(byte) 7] = (byte*) "world " zp[2]:2 [ do10::fn#3 ] zp[1]:4 [ do10::i#2 do10::i#1 ] diff --git a/src/test/ref/function-pointer-noarg-call-10.sym b/src/test/ref/function-pointer-noarg-call-10.sym index 5e009e268..257dcf1f2 100644 --- a/src/test/ref/function-pointer-noarg-call-10.sym +++ b/src/test/ref/function-pointer-noarg-call-10.sym @@ -13,7 +13,7 @@ (byte) do10::i#2 i zp[1]:4 11.0 (void()) hello() (label) hello::@return -(const byte*) hello::msg[(byte) 7] = (string) "hello " +(const byte*) hello::msg[(byte) 7] = (byte*) "hello " (byte) idx loadstore zp[1]:7 5.0 (void()) main() (label) main::@1 @@ -28,7 +28,7 @@ (byte*) print::msg#3 msg zp[2]:5 3.6666666666666665 (void()) world() (label) world::@return -(const byte*) world::msg[(byte) 7] = (string) "world " +(const byte*) world::msg[(byte) 7] = (byte*) "world " zp[2]:2 [ do10::fn#3 ] zp[1]:4 [ do10::i#2 do10::i#1 ] diff --git a/src/test/ref/function-pointer-noarg-call-7.log b/src/test/ref/function-pointer-noarg-call-7.log index 48f8cac4f..98411cb48 100644 --- a/src/test/ref/function-pointer-noarg-call-7.log +++ b/src/test/ref/function-pointer-noarg-call-7.log @@ -93,7 +93,7 @@ SYMBOL TABLE SSA (label) main::@1 (label) main::@return (const void()*) main::f = &(void()) hello() -(const byte*) msg[] = (string) "hello " +(const byte*) msg[] = (byte*) "hello " Adding number conversion cast (unumber) 0 in (bool~) hello::$0 ← (number) 0 != *((const byte*) msg + (byte) hello::i#1) Successful SSA optimization PassNAddNumberTypeConversions @@ -554,7 +554,7 @@ FINAL SYMBOL TABLE (byte) idx loadstore zp[1]:3 21.78571428571429 (void()) main() (label) main::@return -(const byte*) msg[] = (string) "hello " +(const byte*) msg[] = (byte*) "hello " zp[1]:2 [ do10::i#2 do10::i#1 ] reg byte x [ hello::i#2 hello::i#1 ] diff --git a/src/test/ref/function-pointer-noarg-call-7.sym b/src/test/ref/function-pointer-noarg-call-7.sym index ce8aca27d..71fe1058a 100644 --- a/src/test/ref/function-pointer-noarg-call-7.sym +++ b/src/test/ref/function-pointer-noarg-call-7.sym @@ -19,7 +19,7 @@ (byte) idx loadstore zp[1]:3 21.78571428571429 (void()) main() (label) main::@return -(const byte*) msg[] = (string) "hello " +(const byte*) msg[] = (byte*) "hello " zp[1]:2 [ do10::i#2 do10::i#1 ] reg byte x [ hello::i#2 hello::i#1 ] diff --git a/src/test/ref/function-pointer-noarg-call-8.log b/src/test/ref/function-pointer-noarg-call-8.log index 4a6d2fd59..bc663d63c 100644 --- a/src/test/ref/function-pointer-noarg-call-8.log +++ b/src/test/ref/function-pointer-noarg-call-8.log @@ -103,8 +103,8 @@ SYMBOL TABLE SSA (label) main::@return (const void()*) main::f = &(void()) hello() (byte*) msg loadstore -(const byte*) msg1[] = (string) "hello " -(const byte*) msg2[] = (string) "world " +(const byte*) msg1[] = (byte*) "hello " +(const byte*) msg2[] = (byte*) "world " Adding number conversion cast (unumber) 0 in (bool~) hello::$0 ← (number) 0 != *((byte*) msg + (byte) hello::i#1) Successful SSA optimization PassNAddNumberTypeConversions @@ -637,8 +637,8 @@ FINAL SYMBOL TABLE (label) main::@1 (label) main::@return (byte*) msg loadstore zp[2]:3 14.857142857142858 -(const byte*) msg1[] = (string) "hello " -(const byte*) msg2[] = (string) "world " +(const byte*) msg1[] = (byte*) "hello " +(const byte*) msg2[] = (byte*) "world " zp[1]:2 [ do10::i#2 do10::i#1 ] reg byte y [ hello::i#2 hello::i#1 ] diff --git a/src/test/ref/function-pointer-noarg-call-8.sym b/src/test/ref/function-pointer-noarg-call-8.sym index 3677a9aaa..3baf1607e 100644 --- a/src/test/ref/function-pointer-noarg-call-8.sym +++ b/src/test/ref/function-pointer-noarg-call-8.sym @@ -21,8 +21,8 @@ (label) main::@1 (label) main::@return (byte*) msg loadstore zp[2]:3 14.857142857142858 -(const byte*) msg1[] = (string) "hello " -(const byte*) msg2[] = (string) "world " +(const byte*) msg1[] = (byte*) "hello " +(const byte*) msg2[] = (byte*) "world " zp[1]:2 [ do10::i#2 do10::i#1 ] reg byte y [ hello::i#2 hello::i#1 ] diff --git a/src/test/ref/helloworld0.log b/src/test/ref/helloworld0.log index 3cd9e61a7..ac93ef1b4 100644 --- a/src/test/ref/helloworld0.log +++ b/src/test/ref/helloworld0.log @@ -40,7 +40,7 @@ SYMBOL TABLE SSA (byte) main::i#0 (byte) main::i#1 (byte) main::i#2 -(const byte*) msg[] = (string) "hello world!" +(const byte*) msg[] = (byte*) "hello world!" Simplifying constant pointer cast (byte*) 1024 Successful SSA optimization PassNCastSimplification @@ -283,7 +283,7 @@ FINAL SYMBOL TABLE (byte) main::i (byte) main::i#1 reg byte x 16.5 (byte) main::i#2 reg byte x 22.0 -(const byte*) msg[] = (string) "hello world!" +(const byte*) msg[] = (byte*) "hello world!" reg byte x [ main::i#2 main::i#1 ] diff --git a/src/test/ref/helloworld0.sym b/src/test/ref/helloworld0.sym index 9d907a40c..548d77a31 100644 --- a/src/test/ref/helloworld0.sym +++ b/src/test/ref/helloworld0.sym @@ -8,6 +8,6 @@ (byte) main::i (byte) main::i#1 reg byte x 16.5 (byte) main::i#2 reg byte x 22.0 -(const byte*) msg[] = (string) "hello world!" +(const byte*) msg[] = (byte*) "hello world!" reg byte x [ main::i#2 main::i#1 ] diff --git a/src/test/ref/helloworld2-inline.log b/src/test/ref/helloworld2-inline.log index ffe72ca60..902d16a61 100644 --- a/src/test/ref/helloworld2-inline.log +++ b/src/test/ref/helloworld2-inline.log @@ -95,7 +95,7 @@ SYMBOL TABLE SSA (byte*~) main::$1 (label) main::@1 (label) main::@return -(const byte*) main::hello = (string) "hello world!" +(const byte*) main::hello = (byte*) "hello world!" (label) main::print21 (bool~) main::print21_$0 (label) main::print21_@1 @@ -606,7 +606,7 @@ FINAL SYMBOL TABLE (label) @end (void()) main() (label) main::@return -(const byte*) main::hello = (string) "hello world!" +(const byte*) main::hello = (byte*) "hello world!" (label) main::print21 (label) main::print21_@1 (label) main::print21_@2 diff --git a/src/test/ref/helloworld2-inline.sym b/src/test/ref/helloworld2-inline.sym index 3841fafad..41b12eb5b 100644 --- a/src/test/ref/helloworld2-inline.sym +++ b/src/test/ref/helloworld2-inline.sym @@ -3,7 +3,7 @@ (label) @end (void()) main() (label) main::@return -(const byte*) main::hello = (string) "hello world!" +(const byte*) main::hello = (byte*) "hello world!" (label) main::print21 (label) main::print21_@1 (label) main::print21_@2 diff --git a/src/test/ref/helloworld2.log b/src/test/ref/helloworld2.log index cc9cbf3f9..55e7832c9 100644 --- a/src/test/ref/helloworld2.log +++ b/src/test/ref/helloworld2.log @@ -73,7 +73,7 @@ SYMBOL TABLE SSA (label) main::@1 (label) main::@2 (label) main::@return -(const byte*) main::hello = (string) "hello world!" +(const byte*) main::hello = (byte*) "hello world!" (void()) print2((byte*) print2::at , (byte*) print2::msg) (bool~) print2::$0 (label) print2::@1 @@ -504,7 +504,7 @@ FINAL SYMBOL TABLE (void()) main() (label) main::@1 (label) main::@return -(const byte*) main::hello = (string) "hello world!" +(const byte*) main::hello = (byte*) "hello world!" (void()) print2((byte*) print2::at , (byte*) print2::msg) (label) print2::@1 (label) print2::@2 diff --git a/src/test/ref/helloworld2.sym b/src/test/ref/helloworld2.sym index 1b5a7c315..90b3e221b 100644 --- a/src/test/ref/helloworld2.sym +++ b/src/test/ref/helloworld2.sym @@ -4,7 +4,7 @@ (void()) main() (label) main::@1 (label) main::@return -(const byte*) main::hello = (string) "hello world!" +(const byte*) main::hello = (byte*) "hello world!" (void()) print2((byte*) print2::at , (byte*) print2::msg) (label) print2::@1 (label) print2::@2 diff --git a/src/test/ref/hex2dec-ptrptr.log b/src/test/ref/hex2dec-ptrptr.log index 94833291c..45f72b2f5 100644 --- a/src/test/ref/hex2dec-ptrptr.log +++ b/src/test/ref/hex2dec-ptrptr.log @@ -181,7 +181,7 @@ SYMBOL TABLE SSA (label) @5 (label) @begin (label) @end -(const byte*) DIGITS[] = (string) "0123456789abcdef" +(const byte*) DIGITS[] = (byte*) "0123456789abcdef" (void()) cls() (byte*~) cls::$0 (bool~) cls::$1 @@ -1505,7 +1505,7 @@ FINAL SYMBOL TABLE (label) @1 (label) @begin (label) @end -(const byte*) DIGITS[] = (string) "0123456789abcdef" +(const byte*) DIGITS[] = (byte*) "0123456789abcdef" (void()) cls() (label) cls::@1 (label) cls::@return diff --git a/src/test/ref/hex2dec-ptrptr.sym b/src/test/ref/hex2dec-ptrptr.sym index 260d4fcc9..93123363b 100644 --- a/src/test/ref/hex2dec-ptrptr.sym +++ b/src/test/ref/hex2dec-ptrptr.sym @@ -1,7 +1,7 @@ (label) @1 (label) @begin (label) @end -(const byte*) DIGITS[] = (string) "0123456789abcdef" +(const byte*) DIGITS[] = (byte*) "0123456789abcdef" (void()) cls() (label) cls::@1 (label) cls::@return diff --git a/src/test/ref/hex2dec.log b/src/test/ref/hex2dec.log index 0e39aadc1..f6952c7f7 100644 --- a/src/test/ref/hex2dec.log +++ b/src/test/ref/hex2dec.log @@ -337,7 +337,7 @@ SYMBOL TABLE SSA (label) @6 (label) @begin (label) @end -(const byte*) DIGITS[] = (string) "0123456789abcdef" +(const byte*) DIGITS[] = (byte*) "0123456789abcdef" (const byte) SIZEOF_WORD = (byte) 2 (const word*) UTOA10_SUB[] = { (word) $7530, (word) $2710, (word) $bb8, (word) $3e8, (word) $12c, (word) $64, (word) $1e, (word) $a } (const byte*) UTOA10_VAL[] = { (byte) 3, (byte) 1, (byte) 3, (byte) 1, (byte) 3, (byte) 1, (byte) 3, (byte) 1 } @@ -382,7 +382,7 @@ SYMBOL TABLE SSA (byte) main::i#1 (byte) main::i#2 (byte) main::i#3 -(const byte*) main::msg[] = (string) "raster lines" +(const byte*) main::msg[] = (byte*) "raster lines" (byte) main::rst (byte) main::rst#0 (byte*) main::screen @@ -2749,7 +2749,7 @@ FINAL SYMBOL TABLE (label) @1 (label) @begin (label) @end -(const byte*) DIGITS[] = (string) "0123456789abcdef" +(const byte*) DIGITS[] = (byte*) "0123456789abcdef" (const word*) UTOA10_SUB[] = { (word) $7530, (word) $2710, (word) $bb8, (word) $3e8, (word) $12c, (word) $64, (word) $1e, (word) $a } (const byte*) UTOA10_VAL[] = { (byte) 3, (byte) 1, (byte) 3, (byte) 1, (byte) 3, (byte) 1, (byte) 3, (byte) 1 } (const byte*) bordercol = (byte*) 53280 @@ -2776,7 +2776,7 @@ FINAL SYMBOL TABLE (byte) main::i (byte) main::i#1 reg byte x 202.0 (byte) main::i#2 reg byte x 168.33333333333331 -(const byte*) main::msg[] = (string) "raster lines" +(const byte*) main::msg[] = (byte*) "raster lines" (byte) main::rst (byte) main::rst#0 reg byte a 202.0 (byte*) main::screen diff --git a/src/test/ref/hex2dec.sym b/src/test/ref/hex2dec.sym index bac95537f..64ab193d7 100644 --- a/src/test/ref/hex2dec.sym +++ b/src/test/ref/hex2dec.sym @@ -1,7 +1,7 @@ (label) @1 (label) @begin (label) @end -(const byte*) DIGITS[] = (string) "0123456789abcdef" +(const byte*) DIGITS[] = (byte*) "0123456789abcdef" (const word*) UTOA10_SUB[] = { (word) $7530, (word) $2710, (word) $bb8, (word) $3e8, (word) $12c, (word) $64, (word) $1e, (word) $a } (const byte*) UTOA10_VAL[] = { (byte) 3, (byte) 1, (byte) 3, (byte) 1, (byte) 3, (byte) 1, (byte) 3, (byte) 1 } (const byte*) bordercol = (byte*) 53280 @@ -28,7 +28,7 @@ (byte) main::i (byte) main::i#1 reg byte x 202.0 (byte) main::i#2 reg byte x 168.33333333333331 -(const byte*) main::msg[] = (string) "raster lines" +(const byte*) main::msg[] = (byte*) "raster lines" (byte) main::rst (byte) main::rst#0 reg byte a 202.0 (byte*) main::screen diff --git a/src/test/ref/incrementinarray.log b/src/test/ref/incrementinarray.log index 717249f6b..c7d2e6f87 100644 --- a/src/test/ref/incrementinarray.log +++ b/src/test/ref/incrementinarray.log @@ -385,7 +385,7 @@ SYMBOL TABLE SSA (byte*) print_str::str#2 (byte*) print_str::str#3 (byte*) print_str::str#4 -(const byte*) txt[] = (string) "camelot" +(const byte*) txt[] = (byte*) "camelot" Adding number conversion cast (unumber) 0 in (bool~) memset::$0 ← (word) memset::num#1 > (number) 0 Adding number conversion cast (unumber) 0 in (bool~) print_str::$0 ← (number) 0 != *((byte*) print_str::str#2) @@ -1345,7 +1345,7 @@ FINAL SYMBOL TABLE (byte*) print_str::str (byte*) print_str::str#0 str zp[2]:2 202.0 (byte*) print_str::str#2 str zp[2]:2 101.0 -(const byte*) txt[] = (string) "camelot" +(const byte*) txt[] = (byte*) "camelot" reg byte x [ main::i#2 main::i#1 ] zp[2]:2 [ print_str::str#2 print_str::str#0 ] diff --git a/src/test/ref/incrementinarray.sym b/src/test/ref/incrementinarray.sym index 13d1fb47a..4407f0bd2 100644 --- a/src/test/ref/incrementinarray.sym +++ b/src/test/ref/incrementinarray.sym @@ -52,7 +52,7 @@ (byte*) print_str::str (byte*) print_str::str#0 str zp[2]:2 202.0 (byte*) print_str::str#2 str zp[2]:2 101.0 -(const byte*) txt[] = (string) "camelot" +(const byte*) txt[] = (byte*) "camelot" reg byte x [ main::i#2 main::i#1 ] zp[2]:2 [ print_str::str#2 print_str::str#0 ] diff --git a/src/test/ref/inline-asm-label.log b/src/test/ref/inline-asm-label.log index 366e288c6..be549b443 100644 --- a/src/test/ref/inline-asm-label.log +++ b/src/test/ref/inline-asm-label.log @@ -25,7 +25,7 @@ SYMBOL TABLE SSA (const byte*) SCREEN = (byte*)(number) $400 (void()) main() (label) main::@return -(const byte*) table[] = (string) "cml!"z +(const byte*) table[] = (byte*) "cml!"z Simplifying constant pointer cast (byte*) 1024 Successful SSA optimization PassNCastSimplification @@ -190,7 +190,7 @@ FINAL SYMBOL TABLE (const byte*) SCREEN = (byte*) 1024 (void()) main() (label) main::@return -(const byte*) table[] = (string) "cml!"z +(const byte*) table[] = (byte*) "cml!"z diff --git a/src/test/ref/inline-asm-label.sym b/src/test/ref/inline-asm-label.sym index f2a49d9e2..a73feaa92 100644 --- a/src/test/ref/inline-asm-label.sym +++ b/src/test/ref/inline-asm-label.sym @@ -4,5 +4,5 @@ (const byte*) SCREEN = (byte*) 1024 (void()) main() (label) main::@return -(const byte*) table[] = (string) "cml!"z +(const byte*) table[] = (byte*) "cml!"z diff --git a/src/test/ref/inline-asm-refout-const.log b/src/test/ref/inline-asm-refout-const.log index bb5f93769..306214ee9 100644 --- a/src/test/ref/inline-asm-refout-const.log +++ b/src/test/ref/inline-asm-refout-const.log @@ -25,7 +25,7 @@ SYMBOL TABLE SSA (const byte*) SCREEN = (byte*)(number) $400 (void()) main() (label) main::@return -(const byte*) table[] = (string) "cml!"z +(const byte*) table[] = (byte*) "cml!"z Simplifying constant pointer cast (byte*) 1024 Successful SSA optimization PassNCastSimplification @@ -190,7 +190,7 @@ FINAL SYMBOL TABLE (const byte*) SCREEN = (byte*) 1024 (void()) main() (label) main::@return -(const byte*) table[] = (string) "cml!"z +(const byte*) table[] = (byte*) "cml!"z diff --git a/src/test/ref/inline-asm-refout-const.sym b/src/test/ref/inline-asm-refout-const.sym index f2a49d9e2..a73feaa92 100644 --- a/src/test/ref/inline-asm-refout-const.sym +++ b/src/test/ref/inline-asm-refout-const.sym @@ -4,5 +4,5 @@ (const byte*) SCREEN = (byte*) 1024 (void()) main() (label) main::@return -(const byte*) table[] = (string) "cml!"z +(const byte*) table[] = (byte*) "cml!"z diff --git a/src/test/ref/inline-asm-refout.log b/src/test/ref/inline-asm-refout.log index cfed4211e..b7f806b70 100644 --- a/src/test/ref/inline-asm-refout.log +++ b/src/test/ref/inline-asm-refout.log @@ -26,7 +26,7 @@ SYMBOL TABLE SSA (void()) main() (label) main::@return (const byte*) main::SCREEN = (byte*)(number) $400 -(const byte*) table[] = (string) "cml!"z +(const byte*) table[] = (byte*) "cml!"z Adding number conversion cast (unumber) 0 in *((const byte*) main::SCREEN+(number) $28) ← *((const byte*) table + (number) 0) Adding number conversion cast (unumber) $28 in *((const byte*) main::SCREEN+(number) $28) ← *((const byte*) table + (unumber)(number) 0) @@ -209,7 +209,7 @@ FINAL SYMBOL TABLE (void()) main() (label) main::@return (const byte*) main::SCREEN = (byte*) 1024 -(const byte*) table[] = (string) "cml!"z +(const byte*) table[] = (byte*) "cml!"z diff --git a/src/test/ref/inline-asm-refout.sym b/src/test/ref/inline-asm-refout.sym index ab097acb6..95d6a4593 100644 --- a/src/test/ref/inline-asm-refout.sym +++ b/src/test/ref/inline-asm-refout.sym @@ -4,5 +4,5 @@ (void()) main() (label) main::@return (const byte*) main::SCREEN = (byte*) 1024 -(const byte*) table[] = (string) "cml!"z +(const byte*) table[] = (byte*) "cml!"z diff --git a/src/test/ref/inline-function-print.log b/src/test/ref/inline-function-print.log index 196ca47d3..f0f3c9c78 100644 --- a/src/test/ref/inline-function-print.log +++ b/src/test/ref/inline-function-print.log @@ -95,7 +95,7 @@ SYMBOL TABLE SSA (byte*~) main::$1 (label) main::@1 (label) main::@return -(const byte*) main::hello = (string) "hello world!" +(const byte*) main::hello = (byte*) "hello world!" (label) main::print1 (bool~) main::print1_$0 (label) main::print1_@1 @@ -606,7 +606,7 @@ FINAL SYMBOL TABLE (label) @end (void()) main() (label) main::@return -(const byte*) main::hello = (string) "hello world!" +(const byte*) main::hello = (byte*) "hello world!" (label) main::print1 (label) main::print1_@1 (label) main::print1_@2 diff --git a/src/test/ref/inline-function-print.sym b/src/test/ref/inline-function-print.sym index 81244afdb..55abadd49 100644 --- a/src/test/ref/inline-function-print.sym +++ b/src/test/ref/inline-function-print.sym @@ -3,7 +3,7 @@ (label) @end (void()) main() (label) main::@return -(const byte*) main::hello = (string) "hello world!" +(const byte*) main::hello = (byte*) "hello world!" (label) main::print1 (label) main::print1_@1 (label) main::print1_@2 diff --git a/src/test/ref/inline-kasm-refout.log b/src/test/ref/inline-kasm-refout.log index 36096fe04..830f3076e 100644 --- a/src/test/ref/inline-kasm-refout.log +++ b/src/test/ref/inline-kasm-refout.log @@ -32,7 +32,7 @@ SYMBOL TABLE SSA (void()) main() (label) main::@return (const byte*) main::SCREEN = (byte*)(number) $400 -(const byte*) table[] = (string) "cml!"z +(const byte*) table[] = (byte*) "cml!"z Simplifying constant pointer cast (byte*) 1024 Successful SSA optimization PassNCastSimplification @@ -205,7 +205,7 @@ FINAL SYMBOL TABLE (void()) main() (label) main::@return (const byte*) main::SCREEN = (byte*) 1024 -(const byte*) table[] = (string) "cml!"z +(const byte*) table[] = (byte*) "cml!"z diff --git a/src/test/ref/inline-kasm-refout.sym b/src/test/ref/inline-kasm-refout.sym index ab097acb6..95d6a4593 100644 --- a/src/test/ref/inline-kasm-refout.sym +++ b/src/test/ref/inline-kasm-refout.sym @@ -4,5 +4,5 @@ (void()) main() (label) main::@return (const byte*) main::SCREEN = (byte*) 1024 -(const byte*) table[] = (string) "cml!"z +(const byte*) table[] = (byte*) "cml!"z diff --git a/src/test/ref/inline-string-2.log b/src/test/ref/inline-string-2.log index a395adf99..eee241a48 100644 --- a/src/test/ref/inline-string-2.log +++ b/src/test/ref/inline-string-2.log @@ -123,8 +123,8 @@ SYMBOL TABLE SSA (byte*) print::msg#4 (void()) print_msg((byte) print_msg::idx) (bool~) print_msg::$0 -(const byte*) print_msg::$2[(byte) 7] = (string) "Hello " -(const byte*) print_msg::$3[(byte) 7] = (string) "World!" +(const byte*) print_msg::$2[(byte) 7] = (byte*) "Hello " +(const byte*) print_msg::$3[(byte) 7] = (byte*) "World!" (label) print_msg::@1 (label) print_msg::@2 (label) print_msg::@3 @@ -744,8 +744,8 @@ FINAL SYMBOL TABLE (byte) print_msg::idx (byte) print_msg::idx#2 reg byte x 2.0 (byte*) print_msg::msg -(const byte*) print_msg::msg#1 msg_1 = (string) "Hello " -(const byte*) print_msg::msg#2 msg_2 = (string) "World!" +(const byte*) print_msg::msg#1 msg_1 = (byte*) "Hello " +(const byte*) print_msg::msg#2 msg_2 = (byte*) "World!" (byte*) print_msg::msg#3 msg zp[2]:4 2.0 (byte*) screen (byte*) screen#14 screen zp[2]:2 4.625 diff --git a/src/test/ref/inline-string-2.sym b/src/test/ref/inline-string-2.sym index 18068b226..105b4802d 100644 --- a/src/test/ref/inline-string-2.sym +++ b/src/test/ref/inline-string-2.sym @@ -19,8 +19,8 @@ (byte) print_msg::idx (byte) print_msg::idx#2 reg byte x 2.0 (byte*) print_msg::msg -(const byte*) print_msg::msg#1 msg_1 = (string) "Hello " -(const byte*) print_msg::msg#2 msg_2 = (string) "World!" +(const byte*) print_msg::msg#1 msg_1 = (byte*) "Hello " +(const byte*) print_msg::msg#2 msg_2 = (byte*) "World!" (byte*) print_msg::msg#3 msg zp[2]:4 2.0 (byte*) screen (byte*) screen#14 screen zp[2]:2 4.625 diff --git a/src/test/ref/inline-string-3.log b/src/test/ref/inline-string-3.log index c572a72e1..09a8a01aa 100644 --- a/src/test/ref/inline-string-3.log +++ b/src/test/ref/inline-string-3.log @@ -31,7 +31,7 @@ SYMBOL TABLE SSA (label) main::@return (const byte*) main::PTR = (byte*)(number) $9ffe (const byte*) main::SCREEN = (byte*)(number) $400 -(const byte*) main::STRING[] = (string) "camelot"z +(const byte*) main::STRING[] = (byte*) "camelot"z (byte*) main::ptr (byte*) main::ptr#0 @@ -254,7 +254,7 @@ FINAL SYMBOL TABLE (label) main::@return (const byte*) main::PTR = (byte*) 40958 (const byte*) main::SCREEN = (byte*) 1024 -(const byte*) main::STRING[] = (string) "camelot"z +(const byte*) main::STRING[] = (byte*) "camelot"z (byte*) main::ptr (word) main::ptr#0 ptr zp[2]:2 2.0 diff --git a/src/test/ref/inline-string-3.sym b/src/test/ref/inline-string-3.sym index bf25497e6..538935a42 100644 --- a/src/test/ref/inline-string-3.sym +++ b/src/test/ref/inline-string-3.sym @@ -5,7 +5,7 @@ (label) main::@return (const byte*) main::PTR = (byte*) 40958 (const byte*) main::SCREEN = (byte*) 1024 -(const byte*) main::STRING[] = (string) "camelot"z +(const byte*) main::STRING[] = (byte*) "camelot"z (byte*) main::ptr (word) main::ptr#0 ptr zp[2]:2 2.0 diff --git a/src/test/ref/inline-string-4.log b/src/test/ref/inline-string-4.log index 1375d07f4..65adc1520 100644 --- a/src/test/ref/inline-string-4.log +++ b/src/test/ref/inline-string-4.log @@ -40,7 +40,7 @@ SYMBOL TABLE SSA (label) main::@1 (label) main::@return (const dword) main::dw = (dword)(const byte*) main::msg -(const byte*) main::msg[] = (string) "camelot" +(const byte*) main::msg[] = (byte*) "camelot" (void()) output((dword) output::dw) (label) output::@return (dword) output::dw @@ -269,7 +269,7 @@ FINAL SYMBOL TABLE (void()) main() (label) main::@return (const dword) main::dw = (dword)(const byte*) main::msg -(const byte*) main::msg[] = (string) "camelot" +(const byte*) main::msg[] = (byte*) "camelot" (void()) output((dword) output::dw) (label) output::@return (dword) output::dw diff --git a/src/test/ref/inline-string-4.sym b/src/test/ref/inline-string-4.sym index 3733334a1..65708de5c 100644 --- a/src/test/ref/inline-string-4.sym +++ b/src/test/ref/inline-string-4.sym @@ -4,7 +4,7 @@ (void()) main() (label) main::@return (const dword) main::dw = (dword)(const byte*) main::msg -(const byte*) main::msg[] = (string) "camelot" +(const byte*) main::msg[] = (byte*) "camelot" (void()) output((dword) output::dw) (label) output::@return (dword) output::dw diff --git a/src/test/ref/inline-string.log b/src/test/ref/inline-string.log index 6b72fac36..663fcb4fa 100644 --- a/src/test/ref/inline-string.log +++ b/src/test/ref/inline-string.log @@ -83,9 +83,9 @@ SYMBOL TABLE SSA (label) main::@2 (label) main::@3 (label) main::@return -(const byte*) main::msg[(byte) $b] = (string) "message 3 " -(const byte*) main::msg2[] = (string) "message 2 " -(const byte*) msg1[] = (string) "message 1 " +(const byte*) main::msg[(byte) $b] = (byte*) "message 3 " +(const byte*) main::msg2[] = (byte*) "message 2 " +(const byte*) msg1[] = (byte*) "message 1 " (void()) print((byte*) print::msg) (bool~) print::$0 (label) print::@1 @@ -569,9 +569,9 @@ FINAL SYMBOL TABLE (label) main::@1 (label) main::@2 (label) main::@return -(const byte*) main::msg[(byte) $b] = (string) "message 3 " -(const byte*) main::msg2[] = (string) "message 2 " -(const byte*) msg1[] = (string) "message 1 " +(const byte*) main::msg[(byte) $b] = (byte*) "message 3 " +(const byte*) main::msg2[] = (byte*) "message 2 " +(const byte*) msg1[] = (byte*) "message 1 " (void()) print((byte*) print::msg) (label) print::@1 (label) print::@2 diff --git a/src/test/ref/inline-string.sym b/src/test/ref/inline-string.sym index 7ef3ef145..13eac56e6 100644 --- a/src/test/ref/inline-string.sym +++ b/src/test/ref/inline-string.sym @@ -5,9 +5,9 @@ (label) main::@1 (label) main::@2 (label) main::@return -(const byte*) main::msg[(byte) $b] = (string) "message 3 " -(const byte*) main::msg2[] = (string) "message 2 " -(const byte*) msg1[] = (string) "message 1 " +(const byte*) main::msg[(byte) $b] = (byte*) "message 3 " +(const byte*) main::msg2[] = (byte*) "message 2 " +(const byte*) msg1[] = (byte*) "message 1 " (void()) print((byte*) print::msg) (label) print::@1 (label) print::@2 diff --git a/src/test/ref/inlinearrayproblem.log b/src/test/ref/inlinearrayproblem.log index c5ce26800..2c056950f 100644 --- a/src/test/ref/inlinearrayproblem.log +++ b/src/test/ref/inlinearrayproblem.log @@ -44,7 +44,7 @@ SYMBOL TABLE SSA (byte) main::i#0 (byte) main::i#1 (byte) main::i#2 -(const byte*) main::txt[] = (string) "qwe"z +(const byte*) main::txt[] = (byte*) "qwe"z Simplifying constant pointer cast (byte*) 1024 Successful SSA optimization PassNCastSimplification @@ -303,7 +303,7 @@ FINAL SYMBOL TABLE (byte) main::i (byte) main::i#1 reg byte x 16.5 (byte) main::i#2 reg byte x 22.0 -(const byte*) main::txt[] = (string) "qwe"z +(const byte*) main::txt[] = (byte*) "qwe"z reg byte x [ main::i#2 main::i#1 ] diff --git a/src/test/ref/inlinearrayproblem.sym b/src/test/ref/inlinearrayproblem.sym index 716f2fe7a..53b7adab7 100644 --- a/src/test/ref/inlinearrayproblem.sym +++ b/src/test/ref/inlinearrayproblem.sym @@ -10,6 +10,6 @@ (byte) main::i (byte) main::i#1 reg byte x 16.5 (byte) main::i#2 reg byte x 22.0 -(const byte*) main::txt[] = (string) "qwe"z +(const byte*) main::txt[] = (byte*) "qwe"z reg byte x [ main::i#2 main::i#1 ] diff --git a/src/test/ref/inmemstring.log b/src/test/ref/inmemstring.log index 20b0b131c..4f3c4916c 100644 --- a/src/test/ref/inmemstring.log +++ b/src/test/ref/inmemstring.log @@ -47,7 +47,7 @@ SYMBOL TABLE SSA (label) @begin (label) @end (const byte*) SCREEN = (byte*)(number) $400 -(const byte*) TEXT[] = (string) "camelot "z +(const byte*) TEXT[] = (byte*) "camelot "z (void()) main() (bool~) main::$0 (bool~) main::$1 @@ -437,7 +437,7 @@ FINAL SYMBOL TABLE (label) @begin (label) @end (const byte*) SCREEN = (byte*) 1024 -(const byte*) TEXT[] = (string) "camelot "z +(const byte*) TEXT[] = (byte*) "camelot "z (void()) main() (label) main::@1 (label) main::@2 diff --git a/src/test/ref/inmemstring.sym b/src/test/ref/inmemstring.sym index 620fc150f..2159c9162 100644 --- a/src/test/ref/inmemstring.sym +++ b/src/test/ref/inmemstring.sym @@ -2,7 +2,7 @@ (label) @begin (label) @end (const byte*) SCREEN = (byte*) 1024 -(const byte*) TEXT[] = (string) "camelot "z +(const byte*) TEXT[] = (byte*) "camelot "z (void()) main() (label) main::@1 (label) main::@2 diff --git a/src/test/ref/kc-ka-string-encoding.log b/src/test/ref/kc-ka-string-encoding.log index 59acf9506..081319647 100644 --- a/src/test/ref/kc-ka-string-encoding.log +++ b/src/test/ref/kc-ka-string-encoding.log @@ -36,7 +36,7 @@ SYMBOL TABLE SSA (signed word) main::return#1 (signed word) main::return#2 (signed word) main::return#3 -(const byte*) strTemp[] = (string) "v=X"pm +(const byte*) strTemp[] = (byte*) "v=X"pm Adding number conversion cast (unumber) 2 in *((const byte*) strTemp + (number) 2) ← (byte) 'e'pm Adding number conversion cast (unumber) 0 in *((const byte*) strTemp + (number) 3) ← (number) 0 @@ -250,7 +250,7 @@ FINAL SYMBOL TABLE (signed word()) main() (label) main::@return (signed word) main::return -(const byte*) strTemp[] = (string) "v=X"pm +(const byte*) strTemp[] = (byte*) "v=X"pm diff --git a/src/test/ref/kc-ka-string-encoding.sym b/src/test/ref/kc-ka-string-encoding.sym index 1aaf620b2..7be9091ad 100644 --- a/src/test/ref/kc-ka-string-encoding.sym +++ b/src/test/ref/kc-ka-string-encoding.sym @@ -4,5 +4,5 @@ (signed word()) main() (label) main::@return (signed word) main::return -(const byte*) strTemp[] = (string) "v=X"pm +(const byte*) strTemp[] = (byte*) "v=X"pm diff --git a/src/test/ref/linegen.log b/src/test/ref/linegen.log index 77f322e92..f0da09498 100644 --- a/src/test/ref/linegen.log +++ b/src/test/ref/linegen.log @@ -917,15 +917,15 @@ SYMBOL TABLE SSA (const word*) main::lintab1[(number) $14] = { fill( $14, 0) } (const word*) main::lintab2[(number) $14] = { fill( $14, 0) } (const word*) main::lintab3[(number) $14] = { fill( $14, 0) } -(const byte*) main::str[(byte) 4] = (string) " " -(const byte*) main::str1[(byte) 2] = (string) " " -(const byte*) main::str2[(byte) 2] = (string) " " -(const byte*) main::str3[(byte) 2] = (string) " " -(const byte*) main::str4[(byte) 2] = (string) " " -(const byte*) main::str5[(byte) 2] = (string) " " -(const byte*) main::str6[(byte) 4] = (string) " " -(const byte*) main::str7[(byte) 2] = (string) " " -(const byte*) main::str8[(byte) 2] = (string) " " +(const byte*) main::str[(byte) 4] = (byte*) " " +(const byte*) main::str1[(byte) 2] = (byte*) " " +(const byte*) main::str2[(byte) 2] = (byte*) " " +(const byte*) main::str3[(byte) 2] = (byte*) " " +(const byte*) main::str4[(byte) 2] = (byte*) " " +(const byte*) main::str5[(byte) 2] = (byte*) " " +(const byte*) main::str6[(byte) 4] = (byte*) " " +(const byte*) main::str7[(byte) 2] = (byte*) " " +(const byte*) main::str8[(byte) 2] = (byte*) " " (void*()) memset((void*) memset::str , (byte) memset::c , (word) memset::num) (bool~) memset::$0 (bool~) memset::$1 @@ -1081,7 +1081,7 @@ SYMBOL TABLE SSA (void()) print_cls() (label) print_cls::@1 (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#0 (byte*) print_line_cursor#1 @@ -4884,8 +4884,8 @@ FINAL SYMBOL TABLE (const word*) main::lintab1[(number) $14] = { fill( $14, 0) } (const word*) main::lintab2[(number) $14] = { fill( $14, 0) } (const word*) main::lintab3[(number) $14] = { fill( $14, 0) } -(const byte*) main::str[(byte) 4] = (string) " " -(const byte*) main::str1[(byte) 2] = (string) " " +(const byte*) main::str[(byte) 4] = (byte*) " " +(const byte*) main::str1[(byte) 2] = (byte*) " " (void*()) memset((void*) memset::str , (byte) memset::c , (word) memset::num) (label) memset::@1 (label) memset::@2 @@ -4929,7 +4929,7 @@ FINAL SYMBOL TABLE (byte*) print_char_cursor#98 print_char_cursor zp[2]:3 4.0 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:11 8.225 (byte*) print_line_cursor#11 print_line_cursor zp[2]:11 204.0 diff --git a/src/test/ref/linegen.sym b/src/test/ref/linegen.sym index b1f96439b..462b74097 100644 --- a/src/test/ref/linegen.sym +++ b/src/test/ref/linegen.sym @@ -112,8 +112,8 @@ (const word*) main::lintab1[(number) $14] = { fill( $14, 0) } (const word*) main::lintab2[(number) $14] = { fill( $14, 0) } (const word*) main::lintab3[(number) $14] = { fill( $14, 0) } -(const byte*) main::str[(byte) 4] = (string) " " -(const byte*) main::str1[(byte) 2] = (string) " " +(const byte*) main::str[(byte) 4] = (byte*) " " +(const byte*) main::str1[(byte) 2] = (byte*) " " (void*()) memset((void*) memset::str , (byte) memset::c , (word) memset::num) (label) memset::@1 (label) memset::@2 @@ -157,7 +157,7 @@ (byte*) print_char_cursor#98 print_char_cursor zp[2]:3 4.0 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:11 8.225 (byte*) print_line_cursor#11 print_line_cursor zp[2]:11 204.0 diff --git a/src/test/ref/literal-strings.log b/src/test/ref/literal-strings.log index c9c9499a4..974a5be82 100644 --- a/src/test/ref/literal-strings.log +++ b/src/test/ref/literal-strings.log @@ -40,8 +40,8 @@ SYMBOL TABLE SSA (byte) main::i#0 (byte) main::i#1 (byte) main::i#2 -(const byte*) msg[] = (string) "cml" -(const byte*) msgz[] = (string) "cml"z +(const byte*) msg[] = (byte*) "cml" +(const byte*) msgz[] = (byte*) "cml"z Adding number conversion cast (unumber) $28 in *((const byte*) SCREEN+(number) $28 + (byte) main::i#2) ← *((const byte*) msgz + (byte) main::i#2) Successful SSA optimization PassNAddNumberTypeConversions @@ -301,8 +301,8 @@ FINAL SYMBOL TABLE (byte) main::i (byte) main::i#1 reg byte x 16.5 (byte) main::i#2 reg byte x 22.0 -(const byte*) msg[] = (string) "cml" -(const byte*) msgz[] = (string) "cml"z +(const byte*) msg[] = (byte*) "cml" +(const byte*) msgz[] = (byte*) "cml"z reg byte x [ main::i#2 main::i#1 ] diff --git a/src/test/ref/literal-strings.sym b/src/test/ref/literal-strings.sym index 4947c6a14..2a7c51888 100644 --- a/src/test/ref/literal-strings.sym +++ b/src/test/ref/literal-strings.sym @@ -8,7 +8,7 @@ (byte) main::i (byte) main::i#1 reg byte x 16.5 (byte) main::i#2 reg byte x 22.0 -(const byte*) msg[] = (string) "cml" -(const byte*) msgz[] = (string) "cml"z +(const byte*) msg[] = (byte*) "cml" +(const byte*) msgz[] = (byte*) "cml"z reg byte x [ main::i#2 main::i#1 ] diff --git a/src/test/ref/literal-word-pointer-0.log b/src/test/ref/literal-word-pointer-0.log index d1e17cbe6..3026880ed 100644 --- a/src/test/ref/literal-word-pointer-0.log +++ b/src/test/ref/literal-word-pointer-0.log @@ -39,7 +39,7 @@ SYMBOL TABLE SSA (void()) main() (label) main::@1 (label) main::@return -(const byte*) main::str[(byte) 4] = (string) "qwe" +(const byte*) main::str[(byte) 4] = (byte*) "qwe" (void()) print((byte*) print::str) (byte*~) print::$0 (label) print::@return @@ -260,7 +260,7 @@ FINAL SYMBOL TABLE (label) @end (void()) main() (label) main::@return -(const byte*) main::str[(byte) 4] = (string) "qwe" +(const byte*) main::str[(byte) 4] = (byte*) "qwe" (void()) print((byte*) print::str) (label) print::@return (byte*) print::str diff --git a/src/test/ref/literal-word-pointer-0.sym b/src/test/ref/literal-word-pointer-0.sym index e027677df..73a5c5f5b 100644 --- a/src/test/ref/literal-word-pointer-0.sym +++ b/src/test/ref/literal-word-pointer-0.sym @@ -3,7 +3,7 @@ (label) @end (void()) main() (label) main::@return -(const byte*) main::str[(byte) 4] = (string) "qwe" +(const byte*) main::str[(byte) 4] = (byte*) "qwe" (void()) print((byte*) print::str) (label) print::@return (byte*) print::str diff --git a/src/test/ref/literals.log b/src/test/ref/literals.log index cbdd5cd1e..2a2d31107 100644 --- a/src/test/ref/literals.log +++ b/src/test/ref/literals.log @@ -52,7 +52,7 @@ SYMBOL TABLE SSA (byte) main::i#2 (const byte) num = (byte) 1 (const byte*) nums[] = { (byte) 2, (byte) 3, (byte) 4, (byte) 5 } -(const byte*) str[] = (string) "bcde" +(const byte*) str[] = (byte*) "bcde" Adding number conversion cast (unumber) 0 in *((const byte*) SCREEN + (number) 0) ← (const byte) ch Adding number conversion cast (unumber) 2 in *((const byte*) SCREEN + (number) 2) ← (const byte) num @@ -348,7 +348,7 @@ FINAL SYMBOL TABLE (byte) main::i#2 reg byte x 22.0 (const byte) num = (byte) 1 (const byte*) nums[] = { (byte) 2, (byte) 3, (byte) 4, (byte) 5 } -(const byte*) str[] = (string) "bcde" +(const byte*) str[] = (byte*) "bcde" reg byte x [ main::i#2 main::i#1 ] diff --git a/src/test/ref/literals.sym b/src/test/ref/literals.sym index 3706329de..93cce8f90 100644 --- a/src/test/ref/literals.sym +++ b/src/test/ref/literals.sym @@ -11,6 +11,6 @@ (byte) main::i#2 reg byte x 22.0 (const byte) num = (byte) 1 (const byte*) nums[] = { (byte) 2, (byte) 3, (byte) 4, (byte) 5 } -(const byte*) str[] = (string) "bcde" +(const byte*) str[] = (byte*) "bcde" reg byte x [ main::i#2 main::i#1 ] diff --git a/src/test/ref/local-string.log b/src/test/ref/local-string.log index 86400cda9..fe3813b07 100644 --- a/src/test/ref/local-string.log +++ b/src/test/ref/local-string.log @@ -48,7 +48,7 @@ SYMBOL TABLE SSA (byte) main::i#1 (byte) main::i#2 (byte) main::i#3 -(const byte*) main::msg[] = (string) "message 2 " +(const byte*) main::msg[] = (byte*) "message 2 " (const byte*) main::screen = (byte*)(number) $400 Adding number conversion cast (unumber) 0 in (bool~) main::$0 ← (number) 0 != *((const byte*) main::msg + (byte) main::i#2) @@ -296,7 +296,7 @@ FINAL SYMBOL TABLE (byte) main::i (byte) main::i#1 reg byte x 22.0 (byte) main::i#2 reg byte x 18.333333333333332 -(const byte*) main::msg[] = (string) "message 2 " +(const byte*) main::msg[] = (byte*) "message 2 " (const byte*) main::screen = (byte*) 1024 reg byte x [ main::i#2 main::i#1 ] diff --git a/src/test/ref/local-string.sym b/src/test/ref/local-string.sym index 2fbdfe9dc..e2d94ce7c 100644 --- a/src/test/ref/local-string.sym +++ b/src/test/ref/local-string.sym @@ -8,7 +8,7 @@ (byte) main::i (byte) main::i#1 reg byte x 22.0 (byte) main::i#2 reg byte x 18.333333333333332 -(const byte*) main::msg[] = (string) "message 2 " +(const byte*) main::msg[] = (byte*) "message 2 " (const byte*) main::screen = (byte*) 1024 reg byte x [ main::i#2 main::i#1 ] diff --git a/src/test/ref/loop-break-continue.log b/src/test/ref/loop-break-continue.log index a43408e11..07faf550e 100644 --- a/src/test/ref/loop-break-continue.log +++ b/src/test/ref/loop-break-continue.log @@ -81,7 +81,7 @@ SYMBOL TABLE SSA (byte*) main::screen#3 (byte*) main::screen#4 (byte*) main::screen#5 -(const byte*) main::str[] = (string) "hello brave new world" +(const byte*) main::str[] = (byte*) "hello brave new world" Adding number conversion cast (unumber) 0 in (bool~) main::$0 ← *((const byte*) main::str + (byte) main::i#2) == (number) 0 Successful SSA optimization PassNAddNumberTypeConversions @@ -453,7 +453,7 @@ FINAL SYMBOL TABLE (byte*) main::screen#1 screen zp[2]:2 22.0 (byte*) main::screen#2 screen zp[2]:2 11.0 (byte*) main::screen#5 screen zp[2]:2 11.0 -(const byte*) main::str[] = (string) "hello brave new world" +(const byte*) main::str[] = (byte*) "hello brave new world" reg byte x [ main::i#2 main::i#1 ] zp[2]:2 [ main::screen#2 main::screen#5 main::screen#1 ] diff --git a/src/test/ref/loop-break-continue.sym b/src/test/ref/loop-break-continue.sym index 4bbb4dacd..76232a0bc 100644 --- a/src/test/ref/loop-break-continue.sym +++ b/src/test/ref/loop-break-continue.sym @@ -14,7 +14,7 @@ (byte*) main::screen#1 screen zp[2]:2 22.0 (byte*) main::screen#2 screen zp[2]:2 11.0 (byte*) main::screen#5 screen zp[2]:2 11.0 -(const byte*) main::str[] = (string) "hello brave new world" +(const byte*) main::str[] = (byte*) "hello brave new world" reg byte x [ main::i#2 main::i#1 ] zp[2]:2 [ main::screen#2 main::screen#5 main::screen#1 ] diff --git a/src/test/ref/loop-for-continue.log b/src/test/ref/loop-for-continue.log index c71aa3c4c..c7b1f7148 100644 --- a/src/test/ref/loop-for-continue.log +++ b/src/test/ref/loop-for-continue.log @@ -54,7 +54,7 @@ SYMBOL TABLE SSA (label) @2 (label) @begin (label) @end -(const byte*) MESSAGE[] = (string) "hello brave new world!" +(const byte*) MESSAGE[] = (byte*) "hello brave new world!" (const byte*) SCREEN = (byte*)(number) $400 (void()) main() (bool~) main::$0 @@ -403,7 +403,7 @@ FINAL SYMBOL TABLE (label) @1 (label) @begin (label) @end -(const byte*) MESSAGE[] = (string) "hello brave new world!" +(const byte*) MESSAGE[] = (byte*) "hello brave new world!" (const byte*) SCREEN = (byte*) 1024 (void()) main() (label) main::@1 diff --git a/src/test/ref/loop-for-continue.sym b/src/test/ref/loop-for-continue.sym index 87fe07fc8..299167dfc 100644 --- a/src/test/ref/loop-for-continue.sym +++ b/src/test/ref/loop-for-continue.sym @@ -1,7 +1,7 @@ (label) @1 (label) @begin (label) @end -(const byte*) MESSAGE[] = (string) "hello brave new world!" +(const byte*) MESSAGE[] = (byte*) "hello brave new world!" (const byte*) SCREEN = (byte*) 1024 (void()) main() (label) main::@1 diff --git a/src/test/ref/loop-for-empty-body.log b/src/test/ref/loop-for-empty-body.log index 421e42fe6..e4735d7a4 100644 --- a/src/test/ref/loop-for-empty-body.log +++ b/src/test/ref/loop-for-empty-body.log @@ -53,7 +53,7 @@ SYMBOL TABLE SSA (byte) main::b#2 (byte) main::b#3 (byte) main::b#4 -(const byte*) str[] = (string) "Hello!" +(const byte*) str[] = (byte*) "Hello!" Adding number conversion cast (unumber) 0 in (bool~) main::$1 ← *((const byte*) str + (byte) main::b#2) != (number) 0 Adding number conversion cast (unumber) 0 in *((const byte*) SCREEN + (number) 0) ← (byte~) main::$0 @@ -332,7 +332,7 @@ FINAL SYMBOL TABLE (byte) main::b (byte) main::b#1 reg byte x 22.0 (byte) main::b#2 reg byte x 17.5 -(const byte*) str[] = (string) "Hello!" +(const byte*) str[] = (byte*) "Hello!" reg byte x [ main::b#2 main::b#1 ] reg byte x [ main::$0 ] diff --git a/src/test/ref/loop-for-empty-body.sym b/src/test/ref/loop-for-empty-body.sym index aabdd7fd5..2df813e51 100644 --- a/src/test/ref/loop-for-empty-body.sym +++ b/src/test/ref/loop-for-empty-body.sym @@ -11,7 +11,7 @@ (byte) main::b (byte) main::b#1 reg byte x 22.0 (byte) main::b#2 reg byte x 17.5 -(const byte*) str[] = (string) "Hello!" +(const byte*) str[] = (byte*) "Hello!" reg byte x [ main::b#2 main::b#1 ] reg byte x [ main::$0 ] diff --git a/src/test/ref/memcpy-1.log b/src/test/ref/memcpy-1.log index bb01baebd..22a898e08 100644 --- a/src/test/ref/memcpy-1.log +++ b/src/test/ref/memcpy-1.log @@ -116,13 +116,13 @@ SYMBOL TABLE SSA (label) @7 (label) @begin (label) @end -(const byte*) CAMELOT[] = (string) "camelot" +(const byte*) CAMELOT[] = (byte*) "camelot" (const byte*) SCREEN = (byte*)(number) $400 (void()) main() (bool~) main::$2 (bool~) main::$3 -(const byte*) main::$4[(byte) 7] = (string) "reigns" -(const byte*) main::$5[(byte) 6] = (string) "rules" +(const byte*) main::$4[(byte) 7] = (byte*) "reigns" +(const byte*) main::$5[(byte) 6] = (byte*) "rules" (label) main::@1 (label) main::@2 (label) main::@3 @@ -1087,10 +1087,10 @@ FINAL SYMBOL TABLE (label) @1 (label) @begin (label) @end -(const byte*) CAMELOT[] = (string) "camelot" +(const byte*) CAMELOT[] = (byte*) "camelot" (const byte*) SCREEN = (byte*) 1024 (void()) main() -(const byte*) main::$5[(byte) 6] = (string) "rules" +(const byte*) main::$5[(byte) 6] = (byte*) "rules" (label) main::@1 (label) main::@2 (label) main::@3 @@ -1106,7 +1106,7 @@ FINAL SYMBOL TABLE (byte) main::i1#1 reg byte x 16.5 (byte) main::i1#2 reg byte x 5.5 (byte*) main::reigns -(const byte*) main::reigns#0 reigns_1 = (string) "reigns" +(const byte*) main::reigns#0 reigns_1 = (byte*) "reigns" (byte*) main::reigns#1 reigns zp[2]:8 7.333333333333333 (byte*) main::reigns#2 reigns zp[2]:8 11.0 (byte*) main::sc diff --git a/src/test/ref/memcpy-1.sym b/src/test/ref/memcpy-1.sym index 19b523e88..453c56228 100644 --- a/src/test/ref/memcpy-1.sym +++ b/src/test/ref/memcpy-1.sym @@ -1,10 +1,10 @@ (label) @1 (label) @begin (label) @end -(const byte*) CAMELOT[] = (string) "camelot" +(const byte*) CAMELOT[] = (byte*) "camelot" (const byte*) SCREEN = (byte*) 1024 (void()) main() -(const byte*) main::$5[(byte) 6] = (string) "rules" +(const byte*) main::$5[(byte) 6] = (byte*) "rules" (label) main::@1 (label) main::@2 (label) main::@3 @@ -20,7 +20,7 @@ (byte) main::i1#1 reg byte x 16.5 (byte) main::i1#2 reg byte x 5.5 (byte*) main::reigns -(const byte*) main::reigns#0 reigns_1 = (string) "reigns" +(const byte*) main::reigns#0 reigns_1 = (byte*) "reigns" (byte*) main::reigns#1 reigns zp[2]:8 7.333333333333333 (byte*) main::reigns#2 reigns zp[2]:8 11.0 (byte*) main::sc diff --git a/src/test/ref/millfork-benchmarks/linkedlist-kc.log b/src/test/ref/millfork-benchmarks/linkedlist-kc.log index 0f7a581ca..c1d2ab65c 100644 --- a/src/test/ref/millfork-benchmarks/linkedlist-kc.log +++ b/src/test/ref/millfork-benchmarks/linkedlist-kc.log @@ -705,7 +705,7 @@ SYMBOL TABLE SSA (byte*) print_char_cursor#7 (byte*) print_char_cursor#8 (byte*) print_char_cursor#9 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#0 (byte*) print_line_cursor#1 @@ -2812,7 +2812,7 @@ FINAL SYMBOL TABLE (byte*) print_char_cursor#10 print_char_cursor zp[2]:6 0.9333333333333332 (byte*) print_char_cursor#26 print_char_cursor zp[2]:6 9.5 (byte*) print_char_cursor#49 print_char_cursor zp[2]:6 1.8333333333333333 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:4 16.5 (byte*) print_line_cursor#8 print_line_cursor zp[2]:4 22.0 diff --git a/src/test/ref/millfork-benchmarks/linkedlist-kc.sym b/src/test/ref/millfork-benchmarks/linkedlist-kc.sym index 3ae40958d..06bdf41a3 100644 --- a/src/test/ref/millfork-benchmarks/linkedlist-kc.sym +++ b/src/test/ref/millfork-benchmarks/linkedlist-kc.sym @@ -74,7 +74,7 @@ (byte*) print_char_cursor#10 print_char_cursor zp[2]:6 0.9333333333333332 (byte*) print_char_cursor#26 print_char_cursor zp[2]:6 9.5 (byte*) print_char_cursor#49 print_char_cursor zp[2]:6 1.8333333333333333 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:4 16.5 (byte*) print_line_cursor#8 print_line_cursor zp[2]:4 22.0 diff --git a/src/test/ref/millfork-benchmarks/plasma-kc.log b/src/test/ref/millfork-benchmarks/plasma-kc.log index dc67a3241..13ece6532 100644 --- a/src/test/ref/millfork-benchmarks/plasma-kc.log +++ b/src/test/ref/millfork-benchmarks/plasma-kc.log @@ -966,7 +966,7 @@ SYMBOL TABLE SSA (byte*) print_char_cursor#7 (byte*) print_char_cursor#8 (byte*) print_char_cursor#9 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#0 (byte*) print_line_cursor#1 @@ -3990,7 +3990,7 @@ FINAL SYMBOL TABLE (byte*) print_char_cursor#10 print_char_cursor zp[2]:6 1.0 (byte*) print_char_cursor#25 print_char_cursor zp[2]:6 4.0 (byte*) print_char_cursor#35 print_char_cursor zp[2]:6 1.3333333333333333 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:4 16.5 (byte*) print_line_cursor#8 print_line_cursor zp[2]:4 22.0 diff --git a/src/test/ref/millfork-benchmarks/plasma-kc.sym b/src/test/ref/millfork-benchmarks/plasma-kc.sym index fd77b63b9..e4c6cae24 100644 --- a/src/test/ref/millfork-benchmarks/plasma-kc.sym +++ b/src/test/ref/millfork-benchmarks/plasma-kc.sym @@ -141,7 +141,7 @@ (byte*) print_char_cursor#10 print_char_cursor zp[2]:6 1.0 (byte*) print_char_cursor#25 print_char_cursor zp[2]:6 4.0 (byte*) print_char_cursor#35 print_char_cursor zp[2]:6 1.3333333333333333 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:4 16.5 (byte*) print_line_cursor#8 print_line_cursor zp[2]:4 22.0 diff --git a/src/test/ref/millfork-benchmarks/romsum-kc.log b/src/test/ref/millfork-benchmarks/romsum-kc.log index d77caeedf..370a83d64 100644 --- a/src/test/ref/millfork-benchmarks/romsum-kc.log +++ b/src/test/ref/millfork-benchmarks/romsum-kc.log @@ -637,7 +637,7 @@ SYMBOL TABLE SSA (label) @end (const byte) BINARY = (number) 2 (const byte) DECIMAL = (number) $a -(const byte*) DIGITS[] = (string) "0123456789abcdef"z +(const byte*) DIGITS[] = (byte*) "0123456789abcdef"z (const byte) HEXADECIMAL = (number) $10 (const byte) OCTAL = (number) 8 (const byte) RADIX::BINARY = (number) 2 @@ -788,7 +788,7 @@ SYMBOL TABLE SSA (byte*) print_char_cursor#7 (byte*) print_char_cursor#8 (byte*) print_char_cursor#9 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#0 (byte*) print_line_cursor#1 @@ -3734,7 +3734,7 @@ FINAL SYMBOL TABLE (label) @3 (label) @begin (label) @end -(const byte*) DIGITS[] = (string) "0123456789abcdef"z +(const byte*) DIGITS[] = (byte*) "0123456789abcdef"z (const byte) RADIX::BINARY = (number) 2 (const byte) RADIX::DECIMAL = (number) $a (const byte) RADIX::HEXADECIMAL = (number) $10 diff --git a/src/test/ref/millfork-benchmarks/romsum-kc.sym b/src/test/ref/millfork-benchmarks/romsum-kc.sym index bfd2cf7f3..cfdfa52c6 100644 --- a/src/test/ref/millfork-benchmarks/romsum-kc.sym +++ b/src/test/ref/millfork-benchmarks/romsum-kc.sym @@ -3,7 +3,7 @@ (label) @3 (label) @begin (label) @end -(const byte*) DIGITS[] = (string) "0123456789abcdef"z +(const byte*) DIGITS[] = (byte*) "0123456789abcdef"z (const byte) RADIX::BINARY = (number) 2 (const byte) RADIX::DECIMAL = (number) $a (const byte) RADIX::HEXADECIMAL = (number) $10 diff --git a/src/test/ref/millfork-benchmarks/sieve-kc.log b/src/test/ref/millfork-benchmarks/sieve-kc.log index 40de8e7c1..d6c290da7 100644 --- a/src/test/ref/millfork-benchmarks/sieve-kc.log +++ b/src/test/ref/millfork-benchmarks/sieve-kc.log @@ -538,7 +538,7 @@ SYMBOL TABLE SSA (byte*) print_char_cursor#7 (byte*) print_char_cursor#8 (byte*) print_char_cursor#9 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#0 (byte*) print_line_cursor#1 @@ -2380,7 +2380,7 @@ FINAL SYMBOL TABLE (byte*) print_char_cursor#10 print_char_cursor zp[2]:4 1.0 (byte*) print_char_cursor#25 print_char_cursor zp[2]:4 4.0 (byte*) print_char_cursor#35 print_char_cursor zp[2]:4 1.3333333333333333 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:2 16.5 (byte*) print_line_cursor#8 print_line_cursor zp[2]:2 22.0 diff --git a/src/test/ref/millfork-benchmarks/sieve-kc.sym b/src/test/ref/millfork-benchmarks/sieve-kc.sym index d5c78b5c3..9612b2b33 100644 --- a/src/test/ref/millfork-benchmarks/sieve-kc.sym +++ b/src/test/ref/millfork-benchmarks/sieve-kc.sym @@ -51,7 +51,7 @@ (byte*) print_char_cursor#10 print_char_cursor zp[2]:4 1.0 (byte*) print_char_cursor#25 print_char_cursor zp[2]:4 4.0 (byte*) print_char_cursor#35 print_char_cursor zp[2]:4 1.3333333333333333 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:2 16.5 (byte*) print_line_cursor#8 print_line_cursor zp[2]:2 22.0 diff --git a/src/test/ref/min-fmul-16.log b/src/test/ref/min-fmul-16.log index 0db5cd5cb..c35b8f0b3 100644 --- a/src/test/ref/min-fmul-16.log +++ b/src/test/ref/min-fmul-16.log @@ -600,7 +600,7 @@ SYMBOL TABLE SSA (dword) print_dword::dw#0 (dword) print_dword::dw#1 (dword) print_dword::dw#2 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#0 (byte*) print_line_cursor#1 @@ -2798,7 +2798,7 @@ FINAL SYMBOL TABLE (label) print_dword::@return (dword) print_dword::dw (dword) print_dword::dw#0 dw zp[4]:14 5.0 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_screen (void()) print_set_screen((byte*) print_set_screen::screen) diff --git a/src/test/ref/min-fmul-16.sym b/src/test/ref/min-fmul-16.sym index a30e7439f..95d229438 100644 --- a/src/test/ref/min-fmul-16.sym +++ b/src/test/ref/min-fmul-16.sym @@ -103,7 +103,7 @@ (label) print_dword::@return (dword) print_dword::dw (dword) print_dword::dw#0 dw zp[4]:14 5.0 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_screen (void()) print_set_screen((byte*) print_set_screen::screen) diff --git a/src/test/ref/pointer-plus-0.log b/src/test/ref/pointer-plus-0.log index b968b1bb9..da1977980 100644 --- a/src/test/ref/pointer-plus-0.log +++ b/src/test/ref/pointer-plus-0.log @@ -79,8 +79,8 @@ SYMBOL TABLE SSA (label) main::@2 (label) main::@return (const byte*) main::SCREEN = (byte*)(number) $400 -(const byte*) msg1[] = (string) "hello world!" -(const byte*) msg2[] = (string) "goodbye sky?" +(const byte*) msg1[] = (byte*) "hello world!" +(const byte*) msg2[] = (byte*) "goodbye sky?" Adding number conversion cast (unumber) 0 in (byte*~) main::$1 ← (byte*~) main::$0 + (number) 0 Adding number conversion cast (unumber) 0 in *((const byte*) main::SCREEN + (number) 0) ← *((byte*~) main::$1) @@ -481,8 +481,8 @@ FINAL SYMBOL TABLE (label) main::@2 (label) main::@return (const byte*) main::SCREEN = (byte*) 1024 -(const byte*) msg1[] = (string) "hello world!" -(const byte*) msg2[] = (string) "goodbye sky?" +(const byte*) msg1[] = (byte*) "hello world!" +(const byte*) msg2[] = (byte*) "goodbye sky?" zp[2]:2 [ first::return#2 first::return#0 first::return#1 main::$0 main::$2 ] diff --git a/src/test/ref/pointer-plus-0.sym b/src/test/ref/pointer-plus-0.sym index 550d28fed..74243010a 100644 --- a/src/test/ref/pointer-plus-0.sym +++ b/src/test/ref/pointer-plus-0.sym @@ -15,7 +15,7 @@ (label) main::@2 (label) main::@return (const byte*) main::SCREEN = (byte*) 1024 -(const byte*) msg1[] = (string) "hello world!" -(const byte*) msg2[] = (string) "goodbye sky?" +(const byte*) msg1[] = (byte*) "hello world!" +(const byte*) msg2[] = (byte*) "goodbye sky?" zp[2]:2 [ first::return#2 first::return#0 first::return#1 main::$0 main::$2 ] diff --git a/src/test/ref/pointer-pointer-2.log b/src/test/ref/pointer-pointer-2.log index 91011c427..629153fa8 100644 --- a/src/test/ref/pointer-pointer-2.log +++ b/src/test/ref/pointer-pointer-2.log @@ -140,8 +140,8 @@ SYMBOL TABLE SSA (byte**) nexttext::textp#1 (byte**) nexttext::textp#2 (byte**) nexttext::textp#3 -(const byte*) text1[] = (string) "camelot " -(const byte*) text2[] = (string) "rex " +(const byte*) text1[] = (byte*) "camelot " +(const byte*) text2[] = (byte*) "rex " (byte) textid (byte) textid#0 (byte) textid#1 @@ -728,8 +728,8 @@ FINAL SYMBOL TABLE (label) nexttext::@return (byte**) nexttext::textp (const byte**) nexttext::textp#0 textp = &(byte*) main::text -(const byte*) text1[] = (string) "camelot " -(const byte*) text2[] = (string) "rex " +(const byte*) text1[] = (byte*) "camelot " +(const byte*) text2[] = (byte*) "rex " (byte) textid (byte) textid#11 textid zp[1]:2 7.5 (byte) textid#13 textid zp[1]:2 1.0 diff --git a/src/test/ref/pointer-pointer-2.sym b/src/test/ref/pointer-pointer-2.sym index 7c0162a7b..7c2b3142f 100644 --- a/src/test/ref/pointer-pointer-2.sym +++ b/src/test/ref/pointer-pointer-2.sym @@ -22,8 +22,8 @@ (label) nexttext::@return (byte**) nexttext::textp (const byte**) nexttext::textp#0 textp = &(byte*) main::text -(const byte*) text1[] = (string) "camelot " -(const byte*) text2[] = (string) "rex " +(const byte*) text1[] = (byte*) "camelot " +(const byte*) text2[] = (byte*) "rex " (byte) textid (byte) textid#11 textid zp[1]:2 7.5 (byte) textid#13 textid zp[1]:2 1.0 diff --git a/src/test/ref/printmsg.log b/src/test/ref/printmsg.log index 0d6a4779b..72514e786 100644 --- a/src/test/ref/printmsg.log +++ b/src/test/ref/printmsg.log @@ -195,9 +195,9 @@ SYMBOL TABLE SSA (label) main::@5 (label) main::@6 (label) main::@return -(const byte*) msg[] = (string) "hello world! " -(const byte*) msg2[] = (string) "hello c64! " -(const byte*) msg3[] = (string) "hello 2017! " +(const byte*) msg[] = (byte*) "hello world! " +(const byte*) msg2[] = (byte*) "hello c64! " +(const byte*) msg3[] = (byte*) "hello 2017! " (byte*) print_char_cursor (byte*) print_char_cursor#0 (byte*) print_char_cursor#1 @@ -974,9 +974,9 @@ FINAL SYMBOL TABLE (label) main::@4 (label) main::@5 (label) main::@return -(const byte*) msg[] = (string) "hello world! " -(const byte*) msg2[] = (string) "hello c64! " -(const byte*) msg3[] = (string) "hello 2017! " +(const byte*) msg[] = (byte*) "hello world! " +(const byte*) msg2[] = (byte*) "hello c64! " +(const byte*) msg3[] = (byte*) "hello 2017! " (byte*) print_char_cursor (byte*) print_char_cursor#1 print_char_cursor zp[2]:6 11.0 (byte*) print_char_cursor#13 print_char_cursor zp[2]:6 3.2857142857142856 diff --git a/src/test/ref/printmsg.sym b/src/test/ref/printmsg.sym index 8d57f29cc..68c5bd91d 100644 --- a/src/test/ref/printmsg.sym +++ b/src/test/ref/printmsg.sym @@ -12,9 +12,9 @@ (label) main::@4 (label) main::@5 (label) main::@return -(const byte*) msg[] = (string) "hello world! " -(const byte*) msg2[] = (string) "hello c64! " -(const byte*) msg3[] = (string) "hello 2017! " +(const byte*) msg[] = (byte*) "hello world! " +(const byte*) msg2[] = (byte*) "hello c64! " +(const byte*) msg3[] = (byte*) "hello 2017! " (byte*) print_char_cursor (byte*) print_char_cursor#1 print_char_cursor zp[2]:6 11.0 (byte*) print_char_cursor#13 print_char_cursor zp[2]:6 3.2857142857142856 diff --git a/src/test/ref/processor-port-test.log b/src/test/ref/processor-port-test.log index 62224711d..5a8087ab8 100644 --- a/src/test/ref/processor-port-test.log +++ b/src/test/ref/processor-port-test.log @@ -731,7 +731,7 @@ SYMBOL TABLE SSA (label) main::@8 (label) main::@9 (label) main::@return -(const byte*) main::str[(byte) $28] = (string) "ddr port ddr2 $00 $01 $a000 $d000 $e000" +(const byte*) main::str[(byte) $28] = (byte*) "ddr port ddr2 $00 $01 $a000 $d000 $e000" (void*()) memset((void*) memset::str , (byte) memset::c , (word) memset::num) (bool~) memset::$0 (bool~) memset::$1 @@ -924,7 +924,7 @@ SYMBOL TABLE SSA (void()) print_cls() (label) print_cls::@1 (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#0 (byte*) print_line_cursor#1 @@ -1150,14 +1150,14 @@ SYMBOL TABLE SSA (byte) testProcport::port#7 (byte) testProcport::port#8 (byte) testProcport::port#9 -(const byte*) testProcport::str[(byte) 2] = (string) " " -(const byte*) testProcport::str1[(byte) 4] = (string) " " -(const byte*) testProcport::str2[(byte) 4] = (string) " " -(const byte*) testProcport::str3[(byte) 3] = (string) " " -(const byte*) testProcport::str4[(byte) 3] = (string) " " -(const byte*) testProcport::str5[(byte) 5] = (string) " " -(const byte*) testProcport::str6[(byte) 5] = (string) " " -(const byte*) testProcport::str7[(byte) 5] = (string) " " +(const byte*) testProcport::str[(byte) 2] = (byte*) " " +(const byte*) testProcport::str1[(byte) 4] = (byte*) " " +(const byte*) testProcport::str2[(byte) 4] = (byte*) " " +(const byte*) testProcport::str3[(byte) 3] = (byte*) " " +(const byte*) testProcport::str4[(byte) 3] = (byte*) " " +(const byte*) testProcport::str5[(byte) 5] = (byte*) " " +(const byte*) testProcport::str6[(byte) 5] = (byte*) " " +(const byte*) testProcport::str7[(byte) 5] = (byte*) " " Adding number conversion cast (unumber) 0 in (bool~) memset::$0 ← (word) memset::num#1 > (number) 0 Adding number conversion cast (unumber) 0 in (bool~) print_str::$0 ← (number) 0 != *((byte*) print_str::str#10) @@ -4792,7 +4792,7 @@ FINAL SYMBOL TABLE (label) main::@7 (label) main::@8 (label) main::@9 -(const byte*) main::str[(byte) $28] = (string) "ddr port ddr2 $00 $01 $a000 $d000 $e000" +(const byte*) main::str[(byte) $28] = (byte*) "ddr port ddr2 $00 $01 $a000 $d000 $e000" (void*()) memset((void*) memset::str , (byte) memset::c , (word) memset::num) (label) memset::@1 (label) memset::@2 @@ -4840,7 +4840,7 @@ FINAL SYMBOL TABLE (byte*) print_char_cursor#66 print_char_cursor zp[2]:4 0.8695652173913042 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:8 0.4111111111111111 (byte*) print_line_cursor#34 print_line_cursor zp[2]:8 24.0 @@ -4881,10 +4881,10 @@ FINAL SYMBOL TABLE (byte) testProcport::ddr2#23 ddr2 zp[1]:3 0.25 (byte) testProcport::port (byte) testProcport::port#23 port zp[1]:2 0.3333333333333333 -(const byte*) testProcport::str[(byte) 2] = (string) " " -(const byte*) testProcport::str1[(byte) 4] = (string) " " -(const byte*) testProcport::str3[(byte) 3] = (string) " " -(const byte*) testProcport::str5[(byte) 5] = (string) " " +(const byte*) testProcport::str[(byte) 2] = (byte*) " " +(const byte*) testProcport::str1[(byte) 4] = (byte*) " " +(const byte*) testProcport::str3[(byte) 3] = (byte*) " " +(const byte*) testProcport::str5[(byte) 5] = (byte*) " " reg byte x [ testProcport::ddr#23 ] zp[1]:2 [ testProcport::port#23 ] diff --git a/src/test/ref/processor-port-test.sym b/src/test/ref/processor-port-test.sym index 2eaf5cae9..765b79169 100644 --- a/src/test/ref/processor-port-test.sym +++ b/src/test/ref/processor-port-test.sym @@ -45,7 +45,7 @@ (label) main::@7 (label) main::@8 (label) main::@9 -(const byte*) main::str[(byte) $28] = (string) "ddr port ddr2 $00 $01 $a000 $d000 $e000" +(const byte*) main::str[(byte) $28] = (byte*) "ddr port ddr2 $00 $01 $a000 $d000 $e000" (void*()) memset((void*) memset::str , (byte) memset::c , (word) memset::num) (label) memset::@1 (label) memset::@2 @@ -93,7 +93,7 @@ (byte*) print_char_cursor#66 print_char_cursor zp[2]:4 0.8695652173913042 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:8 0.4111111111111111 (byte*) print_line_cursor#34 print_line_cursor zp[2]:8 24.0 @@ -134,10 +134,10 @@ (byte) testProcport::ddr2#23 ddr2 zp[1]:3 0.25 (byte) testProcport::port (byte) testProcport::port#23 port zp[1]:2 0.3333333333333333 -(const byte*) testProcport::str[(byte) 2] = (string) " " -(const byte*) testProcport::str1[(byte) 4] = (string) " " -(const byte*) testProcport::str3[(byte) 3] = (string) " " -(const byte*) testProcport::str5[(byte) 5] = (string) " " +(const byte*) testProcport::str[(byte) 2] = (byte*) " " +(const byte*) testProcport::str1[(byte) 4] = (byte*) " " +(const byte*) testProcport::str3[(byte) 3] = (byte*) " " +(const byte*) testProcport::str5[(byte) 5] = (byte*) " " reg byte x [ testProcport::ddr#23 ] zp[1]:2 [ testProcport::port#23 ] diff --git a/src/test/ref/sandbox.log b/src/test/ref/sandbox.log index 1ef727997..4963f1b79 100644 --- a/src/test/ref/sandbox.log +++ b/src/test/ref/sandbox.log @@ -1500,8 +1500,8 @@ SYMBOL TABLE SSA (signed word) main::return#1 (signed word) main::return#2 (signed word) main::return#3 -(const byte*) main::str[(byte) $24] = (string) "200 DIV16U: %5d,%4d IN %04d FRAMESm" -(const byte*) main::str1[(byte) $24] = (string) "200 DIV10 : %5d,%4d IN %04d FRAMESm" +(const byte*) main::str[(byte) $24] = (byte*) "200 DIV16U: %5d,%4d IN %04d FRAMESm" +(const byte*) main::str1[(byte) $24] = (byte*) "200 DIV10 : %5d,%4d IN %04d FRAMESm" (word) main::u (word) main::u#0 (word) main::u#1 @@ -8205,8 +8205,8 @@ FINAL SYMBOL TABLE (label) main::@9 (label) main::@return (signed word) main::return -(const byte*) main::str[(byte) $24] = (string) "200 DIV16U: %5d,%4d IN %04d FRAMESm" -(const byte*) main::str1[(byte) $24] = (string) "200 DIV10 : %5d,%4d IN %04d FRAMESm" +(const byte*) main::str[(byte) $24] = (byte*) "200 DIV16U: %5d,%4d IN %04d FRAMESm" +(const byte*) main::str1[(byte) $24] = (byte*) "200 DIV10 : %5d,%4d IN %04d FRAMESm" (word) main::u (word) main::u#15 u zp[2]:2 6.380952380952381 (word) main::u#17 u zp[2]:2 6.380952380952381 diff --git a/src/test/ref/sandbox.sym b/src/test/ref/sandbox.sym index f2874b422..6ca5c4d52 100644 --- a/src/test/ref/sandbox.sym +++ b/src/test/ref/sandbox.sym @@ -112,8 +112,8 @@ (label) main::@9 (label) main::@return (signed word) main::return -(const byte*) main::str[(byte) $24] = (string) "200 DIV16U: %5d,%4d IN %04d FRAMESm" -(const byte*) main::str1[(byte) $24] = (string) "200 DIV10 : %5d,%4d IN %04d FRAMESm" +(const byte*) main::str[(byte) $24] = (byte*) "200 DIV16U: %5d,%4d IN %04d FRAMESm" +(const byte*) main::str1[(byte) $24] = (byte*) "200 DIV10 : %5d,%4d IN %04d FRAMESm" (word) main::u (word) main::u#15 u zp[2]:2 6.380952380952381 (word) main::u#17 u zp[2]:2 6.380952380952381 diff --git a/src/test/ref/screen-center-angle.log b/src/test/ref/screen-center-angle.log index 19b2e5593..05911f25a 100644 --- a/src/test/ref/screen-center-angle.log +++ b/src/test/ref/screen-center-angle.log @@ -1112,7 +1112,7 @@ SYMBOL TABLE SSA (dword) print_dword_at::dw#0 (dword) print_dword_at::dw#1 (dword) print_dword_at::dw#2 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (void()) print_word_at((word) print_word_at::w , (byte*) print_word_at::at) (byte~) print_word_at::$0 (byte~) print_word_at::$2 @@ -5235,7 +5235,7 @@ FINAL SYMBOL TABLE (byte*) print_dword_at::at (dword) print_dword_at::dw (dword) print_dword_at::dw#0 dw zp[4]:18 2.0 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (void()) print_word_at((word) print_word_at::w , (byte*) print_word_at::at) (label) print_word_at::@1 (label) print_word_at::@return diff --git a/src/test/ref/screen-center-angle.sym b/src/test/ref/screen-center-angle.sym index 3ed7bc28c..27063f7a8 100644 --- a/src/test/ref/screen-center-angle.sym +++ b/src/test/ref/screen-center-angle.sym @@ -225,7 +225,7 @@ (byte*) print_dword_at::at (dword) print_dword_at::dw (dword) print_dword_at::dw#0 dw zp[4]:18 2.0 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (void()) print_word_at((word) print_word_at::w , (byte*) print_word_at::at) (label) print_word_at::@1 (label) print_word_at::@return diff --git a/src/test/ref/screen-center-distance.log b/src/test/ref/screen-center-distance.log index e3829e4bc..ac2cb9369 100644 --- a/src/test/ref/screen-center-distance.log +++ b/src/test/ref/screen-center-distance.log @@ -1404,7 +1404,7 @@ SYMBOL TABLE SSA (dword) print_dword_at::dw#0 (dword) print_dword_at::dw#1 (dword) print_dword_at::dw#2 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (void()) print_word_at((word) print_word_at::w , (byte*) print_word_at::at) (byte~) print_word_at::$0 (byte~) print_word_at::$2 @@ -5885,7 +5885,7 @@ FINAL SYMBOL TABLE (byte*) print_dword_at::at (dword) print_dword_at::dw (dword) print_dword_at::dw#0 dw zp[4]:13 2.0 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (void()) print_word_at((word) print_word_at::w , (byte*) print_word_at::at) (label) print_word_at::@1 (label) print_word_at::@return diff --git a/src/test/ref/screen-center-distance.sym b/src/test/ref/screen-center-distance.sym index 8b7599d8d..19087a495 100644 --- a/src/test/ref/screen-center-distance.sym +++ b/src/test/ref/screen-center-distance.sym @@ -220,7 +220,7 @@ (byte*) print_dword_at::at (dword) print_dword_at::dw (dword) print_dword_at::dw#0 dw zp[4]:13 2.0 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (void()) print_word_at((word) print_word_at::w , (byte*) print_word_at::at) (label) print_word_at::@1 (label) print_word_at::@return diff --git a/src/test/ref/scroll-clobber.log b/src/test/ref/scroll-clobber.log index 940548cbe..dd59f5104 100644 --- a/src/test/ref/scroll-clobber.log +++ b/src/test/ref/scroll-clobber.log @@ -49,7 +49,7 @@ SYMBOL TABLE SSA (label) @begin (label) @end (const byte*) SCREEN = (byte*)(number) $400 -(const byte*) TEXT[] = (string) "01234567" +(const byte*) TEXT[] = (byte*) "01234567" (void()) main() (bool~) main::$0 (bool~) main::$1 @@ -418,7 +418,7 @@ FINAL SYMBOL TABLE (label) @begin (label) @end (const byte*) SCREEN = (byte*) 1024 -(const byte*) TEXT[] = (string) "01234567" +(const byte*) TEXT[] = (byte*) "01234567" (void()) main() (label) main::@1 (label) main::@2 diff --git a/src/test/ref/scroll-clobber.sym b/src/test/ref/scroll-clobber.sym index ff90a3149..7ec494ebe 100644 --- a/src/test/ref/scroll-clobber.sym +++ b/src/test/ref/scroll-clobber.sym @@ -2,7 +2,7 @@ (label) @begin (label) @end (const byte*) SCREEN = (byte*) 1024 -(const byte*) TEXT[] = (string) "01234567" +(const byte*) TEXT[] = (byte*) "01234567" (void()) main() (label) main::@1 (label) main::@2 diff --git a/src/test/ref/scrollbig-clobber.log b/src/test/ref/scrollbig-clobber.log index a742f1000..69bc19efc 100644 --- a/src/test/ref/scrollbig-clobber.log +++ b/src/test/ref/scrollbig-clobber.log @@ -79,7 +79,7 @@ SYMBOL TABLE SSA (label) @3 (label) @begin (label) @end -(const byte*) TEXT = (string) "cml " +(const byte*) TEXT = (byte*) "cml " (void()) main() (byte~) main::$0 (bool~) main::$1 @@ -586,7 +586,7 @@ FINAL SYMBOL TABLE (label) @1 (label) @begin (label) @end -(const byte*) TEXT = (string) "cml " +(const byte*) TEXT = (byte*) "cml " (void()) main() (byte~) main::$0 reg byte a 22.0 (label) main::@1 diff --git a/src/test/ref/scrollbig-clobber.sym b/src/test/ref/scrollbig-clobber.sym index e1f5d1635..ee31a878e 100644 --- a/src/test/ref/scrollbig-clobber.sym +++ b/src/test/ref/scrollbig-clobber.sym @@ -1,7 +1,7 @@ (label) @1 (label) @begin (label) @end -(const byte*) TEXT = (string) "cml " +(const byte*) TEXT = (byte*) "cml " (void()) main() (byte~) main::$0 reg byte a 22.0 (label) main::@1 diff --git a/src/test/ref/semi-struct-1.log b/src/test/ref/semi-struct-1.log index fc01c28c3..c18c2a02c 100644 --- a/src/test/ref/semi-struct-1.log +++ b/src/test/ref/semi-struct-1.log @@ -722,7 +722,7 @@ SYMBOL TABLE SSA (void()) print_cls() (label) print_cls::@1 (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#0 (byte*) print_line_cursor#1 @@ -844,7 +844,7 @@ SYMBOL TABLE SSA (byte*) print_points::pointYpos1_return#1 (byte*) print_points::pointYpos1_return#2 (byte*) print_points::pointYpos1_return#3 -(const byte*) print_points::str[(byte) 2] = (string) " " +(const byte*) print_points::str[(byte) 2] = (byte*) " " (byte*) print_screen (byte*) print_screen#0 (byte*) print_screen#1 @@ -2739,7 +2739,7 @@ FINAL SYMBOL TABLE (byte*) print_char_cursor#64 print_char_cursor zp[2]:9 22.0 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:4 46.42857142857143 (byte*) print_line_cursor#11 print_line_cursor zp[2]:4 204.0 @@ -2771,7 +2771,7 @@ FINAL SYMBOL TABLE (label) print_points::pointYpos1 (byte*) print_points::pointYpos1_point (byte*) print_points::pointYpos1_return -(const byte*) print_points::str[(byte) 2] = (string) " " +(const byte*) print_points::str[(byte) 2] = (byte*) " " (byte*) print_screen (void()) print_str((byte*) print_str::str) (label) print_str::@1 diff --git a/src/test/ref/semi-struct-1.sym b/src/test/ref/semi-struct-1.sym index 5b8ec9cb7..20c02c917 100644 --- a/src/test/ref/semi-struct-1.sym +++ b/src/test/ref/semi-struct-1.sym @@ -76,7 +76,7 @@ (byte*) print_char_cursor#64 print_char_cursor zp[2]:9 22.0 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:4 46.42857142857143 (byte*) print_line_cursor#11 print_line_cursor zp[2]:4 204.0 @@ -108,7 +108,7 @@ (label) print_points::pointYpos1 (byte*) print_points::pointYpos1_point (byte*) print_points::pointYpos1_return -(const byte*) print_points::str[(byte) 2] = (string) " " +(const byte*) print_points::str[(byte) 2] = (byte*) " " (byte*) print_screen (void()) print_str((byte*) print_str::str) (label) print_str::@1 diff --git a/src/test/ref/semi-struct-2.log b/src/test/ref/semi-struct-2.log index 7660b72a7..10c528752 100644 --- a/src/test/ref/semi-struct-2.log +++ b/src/test/ref/semi-struct-2.log @@ -2123,10 +2123,10 @@ SYMBOL TABLE SSA (byte*) main::fileEntry2_return#1 (byte*) main::fileEntry2_return#2 (byte*) main::fileEntry2_return#3 -(const byte*) main::str[(byte) $e] = (string) "** entry 1 **" -(const byte*) main::str1[(byte) $10] = (string) "- press space -" -(const byte*) main::str2[(byte) $e] = (string) "** entry 2 **" -(const byte*) main::str3[(byte) $10] = (string) "- press space -" +(const byte*) main::str[(byte) $e] = (byte*) "** entry 1 **" +(const byte*) main::str1[(byte) $10] = (byte*) "- press space -" +(const byte*) main::str2[(byte) $e] = (byte*) "** entry 2 **" +(const byte*) main::str3[(byte) $10] = (byte*) "- press space -" (void*()) memset((void*) memset::str , (byte) memset::c , (word) memset::num) (bool~) memset::$0 (bool~) memset::$1 @@ -2521,19 +2521,19 @@ SYMBOL TABLE SSA (word*) printEntry::entryUCross1_return#1 (word*) printEntry::entryUCross1_return#2 (word*) printEntry::entryUCross1_return#3 -(const byte*) printEntry::str[(byte) $b] = (string) "bufdisk " -(const byte*) printEntry::str1[(byte) $b] = (string) "bufedit " -(const byte*) printEntry::str10[(byte) $d] = (string) "baddrhi " -(const byte*) printEntry::str11[(byte) $d] = (string) "thi " -(const byte*) printEntry::str12[(byte) $d] = (string) "tlo " -(const byte*) printEntry::str2[(byte) $b] = (string) "tslen " -(const byte*) printEntry::str3[(byte) $b] = (string) "tsorder " -(const byte*) printEntry::str4[(byte) $d] = (string) "tlastlink " -(const byte*) printEntry::str5[(byte) $d] = (string) "slastlink " -(const byte*) printEntry::str6[(byte) $d] = (string) "bflag " -(const byte*) printEntry::str7[(byte) $d] = (string) "berror " -(const byte*) printEntry::str8[(byte) $b] = (string) "ucross " -(const byte*) printEntry::str9[(byte) $d] = (string) "baddrlo " +(const byte*) printEntry::str[(byte) $b] = (byte*) "bufdisk " +(const byte*) printEntry::str1[(byte) $b] = (byte*) "bufedit " +(const byte*) printEntry::str10[(byte) $d] = (byte*) "baddrhi " +(const byte*) printEntry::str11[(byte) $d] = (byte*) "thi " +(const byte*) printEntry::str12[(byte) $d] = (byte*) "tlo " +(const byte*) printEntry::str2[(byte) $b] = (byte*) "tslen " +(const byte*) printEntry::str3[(byte) $b] = (byte*) "tsorder " +(const byte*) printEntry::str4[(byte) $d] = (byte*) "tlastlink " +(const byte*) printEntry::str5[(byte) $d] = (byte*) "slastlink " +(const byte*) printEntry::str6[(byte) $d] = (byte*) "bflag " +(const byte*) printEntry::str7[(byte) $d] = (byte*) "berror " +(const byte*) printEntry::str8[(byte) $b] = (byte*) "ucross " +(const byte*) printEntry::str9[(byte) $d] = (byte*) "baddrlo " (void()) print_byte((byte) print_byte::b) (byte~) print_byte::$0 (number~) print_byte::$2 @@ -2769,7 +2769,7 @@ SYMBOL TABLE SSA (void()) print_cls() (label) print_cls::@1 (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#0 (byte*) print_line_cursor#1 @@ -9506,9 +9506,9 @@ FINAL SYMBOL TABLE (byte) main::fileEntry2_idx (const byte) main::fileEntry2_idx#0 fileEntry2_idx = (byte) 2 (byte*) main::fileEntry2_return -(const byte*) main::str[(byte) $e] = (string) "** entry 1 **" -(const byte*) main::str1[(byte) $10] = (string) "- press space -" -(const byte*) main::str2[(byte) $e] = (string) "** entry 2 **" +(const byte*) main::str[(byte) $e] = (byte*) "** entry 1 **" +(const byte*) main::str1[(byte) $10] = (byte*) "- press space -" +(const byte*) main::str2[(byte) $e] = (byte*) "** entry 2 **" (void*()) memset((void*) memset::str , (byte) memset::c , (word) memset::num) (label) memset::@1 (label) memset::@2 @@ -9630,19 +9630,19 @@ FINAL SYMBOL TABLE (label) printEntry::entryUCross1 (byte*) printEntry::entryUCross1_entry (word*) printEntry::entryUCross1_return -(const byte*) printEntry::str[(byte) $b] = (string) "bufdisk " -(const byte*) printEntry::str1[(byte) $b] = (string) "bufedit " -(const byte*) printEntry::str10[(byte) $d] = (string) "baddrhi " -(const byte*) printEntry::str11[(byte) $d] = (string) "thi " -(const byte*) printEntry::str12[(byte) $d] = (string) "tlo " -(const byte*) printEntry::str2[(byte) $b] = (string) "tslen " -(const byte*) printEntry::str3[(byte) $b] = (string) "tsorder " -(const byte*) printEntry::str4[(byte) $d] = (string) "tlastlink " -(const byte*) printEntry::str5[(byte) $d] = (string) "slastlink " -(const byte*) printEntry::str6[(byte) $d] = (string) "bflag " -(const byte*) printEntry::str7[(byte) $d] = (string) "berror " -(const byte*) printEntry::str8[(byte) $b] = (string) "ucross " -(const byte*) printEntry::str9[(byte) $d] = (string) "baddrlo " +(const byte*) printEntry::str[(byte) $b] = (byte*) "bufdisk " +(const byte*) printEntry::str1[(byte) $b] = (byte*) "bufedit " +(const byte*) printEntry::str10[(byte) $d] = (byte*) "baddrhi " +(const byte*) printEntry::str11[(byte) $d] = (byte*) "thi " +(const byte*) printEntry::str12[(byte) $d] = (byte*) "tlo " +(const byte*) printEntry::str2[(byte) $b] = (byte*) "tslen " +(const byte*) printEntry::str3[(byte) $b] = (byte*) "tsorder " +(const byte*) printEntry::str4[(byte) $d] = (byte*) "tlastlink " +(const byte*) printEntry::str5[(byte) $d] = (byte*) "slastlink " +(const byte*) printEntry::str6[(byte) $d] = (byte*) "bflag " +(const byte*) printEntry::str7[(byte) $d] = (byte*) "berror " +(const byte*) printEntry::str8[(byte) $b] = (byte*) "ucross " +(const byte*) printEntry::str9[(byte) $d] = (byte*) "baddrlo " (void()) print_byte((byte) print_byte::b) (byte~) print_byte::$0 reg byte a 4.0 (byte~) print_byte::$2 reg byte x 4.0 @@ -9695,7 +9695,7 @@ FINAL SYMBOL TABLE (byte*) print_char_cursor#82 print_char_cursor zp[2]:4 4.0 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:8 1.0824742268041243 (byte*) print_line_cursor#153 print_line_cursor_1 zp[2]:10 2.0 diff --git a/src/test/ref/semi-struct-2.sym b/src/test/ref/semi-struct-2.sym index 268796b1b..7f1f62bbe 100644 --- a/src/test/ref/semi-struct-2.sym +++ b/src/test/ref/semi-struct-2.sym @@ -151,9 +151,9 @@ (byte) main::fileEntry2_idx (const byte) main::fileEntry2_idx#0 fileEntry2_idx = (byte) 2 (byte*) main::fileEntry2_return -(const byte*) main::str[(byte) $e] = (string) "** entry 1 **" -(const byte*) main::str1[(byte) $10] = (string) "- press space -" -(const byte*) main::str2[(byte) $e] = (string) "** entry 2 **" +(const byte*) main::str[(byte) $e] = (byte*) "** entry 1 **" +(const byte*) main::str1[(byte) $10] = (byte*) "- press space -" +(const byte*) main::str2[(byte) $e] = (byte*) "** entry 2 **" (void*()) memset((void*) memset::str , (byte) memset::c , (word) memset::num) (label) memset::@1 (label) memset::@2 @@ -275,19 +275,19 @@ (label) printEntry::entryUCross1 (byte*) printEntry::entryUCross1_entry (word*) printEntry::entryUCross1_return -(const byte*) printEntry::str[(byte) $b] = (string) "bufdisk " -(const byte*) printEntry::str1[(byte) $b] = (string) "bufedit " -(const byte*) printEntry::str10[(byte) $d] = (string) "baddrhi " -(const byte*) printEntry::str11[(byte) $d] = (string) "thi " -(const byte*) printEntry::str12[(byte) $d] = (string) "tlo " -(const byte*) printEntry::str2[(byte) $b] = (string) "tslen " -(const byte*) printEntry::str3[(byte) $b] = (string) "tsorder " -(const byte*) printEntry::str4[(byte) $d] = (string) "tlastlink " -(const byte*) printEntry::str5[(byte) $d] = (string) "slastlink " -(const byte*) printEntry::str6[(byte) $d] = (string) "bflag " -(const byte*) printEntry::str7[(byte) $d] = (string) "berror " -(const byte*) printEntry::str8[(byte) $b] = (string) "ucross " -(const byte*) printEntry::str9[(byte) $d] = (string) "baddrlo " +(const byte*) printEntry::str[(byte) $b] = (byte*) "bufdisk " +(const byte*) printEntry::str1[(byte) $b] = (byte*) "bufedit " +(const byte*) printEntry::str10[(byte) $d] = (byte*) "baddrhi " +(const byte*) printEntry::str11[(byte) $d] = (byte*) "thi " +(const byte*) printEntry::str12[(byte) $d] = (byte*) "tlo " +(const byte*) printEntry::str2[(byte) $b] = (byte*) "tslen " +(const byte*) printEntry::str3[(byte) $b] = (byte*) "tsorder " +(const byte*) printEntry::str4[(byte) $d] = (byte*) "tlastlink " +(const byte*) printEntry::str5[(byte) $d] = (byte*) "slastlink " +(const byte*) printEntry::str6[(byte) $d] = (byte*) "bflag " +(const byte*) printEntry::str7[(byte) $d] = (byte*) "berror " +(const byte*) printEntry::str8[(byte) $b] = (byte*) "ucross " +(const byte*) printEntry::str9[(byte) $d] = (byte*) "baddrlo " (void()) print_byte((byte) print_byte::b) (byte~) print_byte::$0 reg byte a 4.0 (byte~) print_byte::$2 reg byte x 4.0 @@ -340,7 +340,7 @@ (byte*) print_char_cursor#82 print_char_cursor zp[2]:4 4.0 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:8 1.0824742268041243 (byte*) print_line_cursor#153 print_line_cursor_1 zp[2]:10 2.0 diff --git a/src/test/ref/sieve-min.log b/src/test/ref/sieve-min.log index ca255ef1b..bcef9db59 100644 --- a/src/test/ref/sieve-min.log +++ b/src/test/ref/sieve-min.log @@ -517,7 +517,7 @@ SYMBOL TABLE SSA (byte*) print_char_cursor#7 (byte*) print_char_cursor#8 (byte*) print_char_cursor#9 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#0 (byte*) print_screen @@ -1977,7 +1977,7 @@ FINAL SYMBOL TABLE (byte*) print_char_cursor#26 print_char_cursor zp[2]:8 2.0 (byte*) print_char_cursor#27 print_char_cursor zp[2]:8 4.0 (byte*) print_char_cursor#33 print_char_cursor zp[2]:8 16.5 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_screen (void()) print_word((word) print_word::w) diff --git a/src/test/ref/sieve-min.sym b/src/test/ref/sieve-min.sym index 940bf2954..44763b9a5 100644 --- a/src/test/ref/sieve-min.sym +++ b/src/test/ref/sieve-min.sym @@ -74,7 +74,7 @@ (byte*) print_char_cursor#26 print_char_cursor zp[2]:8 2.0 (byte*) print_char_cursor#27 print_char_cursor zp[2]:8 4.0 (byte*) print_char_cursor#33 print_char_cursor zp[2]:8 16.5 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_screen (void()) print_word((word) print_word::w) diff --git a/src/test/ref/sieve.log b/src/test/ref/sieve.log index 120baf964..ff5cbd376 100644 --- a/src/test/ref/sieve.log +++ b/src/test/ref/sieve.log @@ -1189,7 +1189,7 @@ SYMBOL TABLE SSA (const word) COUNT = (word) $4000 (const byte*) D018 = (byte*)(number) $d018 (const byte) DECIMAL = (number) $a -(const byte*) DIGITS[] = (string) "0123456789abcdef"z +(const byte*) DIGITS[] = (byte*) "0123456789abcdef"z (const byte) FRAMES_PER_SEC = (byte) $3c (const byte) HEXADECIMAL = (number) $10 (const byte) OCTAL = (number) 8 @@ -1426,11 +1426,11 @@ SYMBOL TABLE SSA (byte*) main::sieve_i#5 (byte*) main::sieve_i#6 (byte*) main::sieve_i#7 -(const byte*) main::str[(byte) $25] = (string) "Sieve benchmark - calculating primes" -(const byte*) main::str1[(byte) $f] = (string) "between 2 and " -(const byte*) main::str2[(byte) $16] = (string) "100ths seconds used: " -(const byte*) main::str3[(byte) $a] = (string) " cycles: " -(const byte*) main::str4[(byte) 4] = (string) "..." +(const byte*) main::str[(byte) $25] = (byte*) "Sieve benchmark - calculating primes" +(const byte*) main::str1[(byte) $f] = (byte*) "between 2 and " +(const byte*) main::str2[(byte) $16] = (byte*) "100ths seconds used: " +(const byte*) main::str3[(byte) $a] = (byte*) " cycles: " +(const byte*) main::str4[(byte) 4] = (byte*) "..." (label) main::toD0181 (word~) main::toD0181_$0 (number~) main::toD0181_$1 @@ -7461,7 +7461,7 @@ FINAL SYMBOL TABLE (const dword) CLOCKS_PER_SEC = (dword)(const word) CLOCKS_PER_FRAME*(const byte) FRAMES_PER_SEC (const word) COUNT = (word) $4000 (const byte*) D018 = (byte*) 53272 -(const byte*) DIGITS[] = (string) "0123456789abcdef"z +(const byte*) DIGITS[] = (byte*) "0123456789abcdef"z (const byte) FRAMES_PER_SEC = (byte) $3c (const byte) RADIX::BINARY = (number) 2 (const byte) RADIX::DECIMAL = (number) $a @@ -7585,11 +7585,11 @@ FINAL SYMBOL TABLE (byte*) main::sieve_i (byte*) main::sieve_i#1 sieve_i zp[2]:15 22.0 (byte*) main::sieve_i#2 sieve_i zp[2]:15 3.0 -(const byte*) main::str[(byte) $25] = (string) "Sieve benchmark - calculating primes" -(const byte*) main::str1[(byte) $f] = (string) "between 2 and " -(const byte*) main::str2[(byte) $16] = (string) "100ths seconds used: " -(const byte*) main::str3[(byte) $a] = (string) " cycles: " -(const byte*) main::str4[(byte) 4] = (string) "..." +(const byte*) main::str[(byte) $25] = (byte*) "Sieve benchmark - calculating primes" +(const byte*) main::str1[(byte) $f] = (byte*) "between 2 and " +(const byte*) main::str2[(byte) $16] = (byte*) "100ths seconds used: " +(const byte*) main::str3[(byte) $a] = (byte*) " cycles: " +(const byte*) main::str4[(byte) 4] = (byte*) "..." (label) main::toD0181 (byte*) main::toD0181_gfx (const byte*) main::toD0181_gfx#0 toD0181_gfx = (byte*) 6144 diff --git a/src/test/ref/sieve.sym b/src/test/ref/sieve.sym index c1ec48b22..7c032ea7e 100644 --- a/src/test/ref/sieve.sym +++ b/src/test/ref/sieve.sym @@ -11,7 +11,7 @@ (const dword) CLOCKS_PER_SEC = (dword)(const word) CLOCKS_PER_FRAME*(const byte) FRAMES_PER_SEC (const word) COUNT = (word) $4000 (const byte*) D018 = (byte*) 53272 -(const byte*) DIGITS[] = (string) "0123456789abcdef"z +(const byte*) DIGITS[] = (byte*) "0123456789abcdef"z (const byte) FRAMES_PER_SEC = (byte) $3c (const byte) RADIX::BINARY = (number) 2 (const byte) RADIX::DECIMAL = (number) $a @@ -135,11 +135,11 @@ (byte*) main::sieve_i (byte*) main::sieve_i#1 sieve_i zp[2]:15 22.0 (byte*) main::sieve_i#2 sieve_i zp[2]:15 3.0 -(const byte*) main::str[(byte) $25] = (string) "Sieve benchmark - calculating primes" -(const byte*) main::str1[(byte) $f] = (string) "between 2 and " -(const byte*) main::str2[(byte) $16] = (string) "100ths seconds used: " -(const byte*) main::str3[(byte) $a] = (string) " cycles: " -(const byte*) main::str4[(byte) 4] = (string) "..." +(const byte*) main::str[(byte) $25] = (byte*) "Sieve benchmark - calculating primes" +(const byte*) main::str1[(byte) $f] = (byte*) "between 2 and " +(const byte*) main::str2[(byte) $16] = (byte*) "100ths seconds used: " +(const byte*) main::str3[(byte) $a] = (byte*) " cycles: " +(const byte*) main::str4[(byte) 4] = (byte*) "..." (label) main::toD0181 (byte*) main::toD0181_gfx (const byte*) main::toD0181_gfx#0 toD0181_gfx = (byte*) 6144 diff --git a/src/test/ref/signed-indexed-subtract.log b/src/test/ref/signed-indexed-subtract.log index 17770a885..2152986d0 100644 --- a/src/test/ref/signed-indexed-subtract.log +++ b/src/test/ref/signed-indexed-subtract.log @@ -545,7 +545,7 @@ SYMBOL TABLE SSA (void()) print_cls() (label) print_cls::@1 (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#0 (byte*) print_line_cursor#1 @@ -2318,7 +2318,7 @@ FINAL SYMBOL TABLE (byte*) print_char_cursor#61 print_char_cursor zp[2]:4 22.0 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:7 46.42857142857143 (byte*) print_line_cursor#19 print_line_cursor zp[2]:7 2.1666666666666665 diff --git a/src/test/ref/signed-indexed-subtract.sym b/src/test/ref/signed-indexed-subtract.sym index a92b4a4c4..7b743d672 100644 --- a/src/test/ref/signed-indexed-subtract.sym +++ b/src/test/ref/signed-indexed-subtract.sym @@ -61,7 +61,7 @@ (byte*) print_char_cursor#61 print_char_cursor zp[2]:4 22.0 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:7 46.42857142857143 (byte*) print_line_cursor#19 print_line_cursor zp[2]:7 2.1666666666666665 diff --git a/src/test/ref/sinus-basic.log b/src/test/ref/sinus-basic.log index 7b76d47ce..f77bdb226 100644 --- a/src/test/ref/sinus-basic.log +++ b/src/test/ref/sinus-basic.log @@ -616,7 +616,7 @@ SYMBOL TABLE SSA (byte*) print_char_cursor#7 (byte*) print_char_cursor#8 (byte*) print_char_cursor#9 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#0 (byte*) print_line_cursor#1 @@ -2775,7 +2775,7 @@ FINAL SYMBOL TABLE (byte*) print_char_cursor#31 print_char_cursor zp[2]:5 2.0 (byte*) print_char_cursor#32 print_char_cursor zp[2]:5 0.5909090909090909 (byte*) print_char_cursor#51 print_char_cursor zp[2]:5 22.0 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:3 46.42857142857143 (byte*) print_line_cursor#13 print_line_cursor zp[2]:3 0.5416666666666666 diff --git a/src/test/ref/sinus-basic.sym b/src/test/ref/sinus-basic.sym index f199402da..4252404fc 100644 --- a/src/test/ref/sinus-basic.sym +++ b/src/test/ref/sinus-basic.sym @@ -82,7 +82,7 @@ (byte*) print_char_cursor#31 print_char_cursor zp[2]:5 2.0 (byte*) print_char_cursor#32 print_char_cursor zp[2]:5 0.5909090909090909 (byte*) print_char_cursor#51 print_char_cursor zp[2]:5 22.0 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:3 46.42857142857143 (byte*) print_line_cursor#13 print_line_cursor zp[2]:3 0.5416666666666666 diff --git a/src/test/ref/sinusgen16.log b/src/test/ref/sinusgen16.log index 619ab0b52..c3782b59d 100644 --- a/src/test/ref/sinusgen16.log +++ b/src/test/ref/sinusgen16.log @@ -961,8 +961,8 @@ SYMBOL TABLE SSA (signed word*) main::st1#6 (signed word*) main::st1#7 (signed word*) main::st1#8 -(const byte*) main::str[(byte) 4] = (string) " " -(const byte*) main::str1[(byte) 2] = (string) " " +(const byte*) main::str[(byte) 4] = (byte*) " " +(const byte*) main::str1[(byte) 2] = (byte*) " " (signed word) main::sw (signed word) main::sw#0 (signed word) main::sw#1 @@ -1181,7 +1181,7 @@ SYMBOL TABLE SSA (void()) print_cls() (label) print_cls::@1 (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#0 (byte*) print_line_cursor#1 @@ -5787,8 +5787,8 @@ FINAL SYMBOL TABLE (signed word*) main::st1 (signed word*) main::st1#1 st1 zp[2]:16 22.0 (signed word*) main::st1#2 st1 zp[2]:16 4.0 -(const byte*) main::str[(byte) 4] = (string) " " -(const byte*) main::str1[(byte) 2] = (string) " " +(const byte*) main::str[(byte) 4] = (byte*) " " +(const byte*) main::str1[(byte) 2] = (byte*) " " (signed word) main::sw (signed word) main::sw#0 sw zp[2]:8 6.6000000000000005 (const word) main::wavelength = (word) $78 @@ -5883,7 +5883,7 @@ FINAL SYMBOL TABLE (byte*) print_char_cursor#55 print_char_cursor zp[2]:10 24.0 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (const byte*) print_line_cursor#0 print_line_cursor = (byte*) 1024 (byte*) print_screen diff --git a/src/test/ref/sinusgen16.sym b/src/test/ref/sinusgen16.sym index 5c32ff2a8..2f67789e9 100644 --- a/src/test/ref/sinusgen16.sym +++ b/src/test/ref/sinusgen16.sym @@ -71,8 +71,8 @@ (signed word*) main::st1 (signed word*) main::st1#1 st1 zp[2]:16 22.0 (signed word*) main::st1#2 st1 zp[2]:16 4.0 -(const byte*) main::str[(byte) 4] = (string) " " -(const byte*) main::str1[(byte) 2] = (string) " " +(const byte*) main::str[(byte) 4] = (byte*) " " +(const byte*) main::str1[(byte) 2] = (byte*) " " (signed word) main::sw (signed word) main::sw#0 sw zp[2]:8 6.6000000000000005 (const word) main::wavelength = (word) $78 @@ -167,7 +167,7 @@ (byte*) print_char_cursor#55 print_char_cursor zp[2]:10 24.0 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (const byte*) print_line_cursor#0 print_line_cursor = (byte*) 1024 (byte*) print_screen diff --git a/src/test/ref/sinusgen16b.log b/src/test/ref/sinusgen16b.log index b7c8453c8..1e9cebb70 100644 --- a/src/test/ref/sinusgen16b.log +++ b/src/test/ref/sinusgen16b.log @@ -1194,8 +1194,8 @@ SYMBOL TABLE SSA (signed word*) main::st2#5 (signed word*) main::st2#6 (signed word*) main::st2#7 -(const byte*) main::str[(byte) 4] = (string) " " -(const byte*) main::str1[(byte) 2] = (string) " " +(const byte*) main::str[(byte) 4] = (byte*) " " +(const byte*) main::str1[(byte) 2] = (byte*) " " (signed word) main::sw (signed word) main::sw#0 (signed word) main::sw#1 @@ -1439,7 +1439,7 @@ SYMBOL TABLE SSA (void()) print_cls() (label) print_cls::@1 (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#0 (byte*) print_line_cursor#1 @@ -7737,8 +7737,8 @@ FINAL SYMBOL TABLE (signed word*) main::st2 (signed word*) main::st2#1 st2 zp[2]:11 7.333333333333333 (signed word*) main::st2#2 st2 zp[2]:11 3.0 -(const byte*) main::str[(byte) 4] = (string) " " -(const byte*) main::str1[(byte) 2] = (string) " " +(const byte*) main::str[(byte) 4] = (byte*) " " +(const byte*) main::str1[(byte) 2] = (byte*) " " (signed word) main::sw (signed word) main::sw#0 sw zp[2]:25 6.6000000000000005 (const word) main::wavelength = (word) $78 @@ -7847,7 +7847,7 @@ FINAL SYMBOL TABLE (byte*) print_char_cursor#54 print_char_cursor zp[2]:31 24.0 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (const byte*) print_line_cursor#0 print_line_cursor = (byte*) 1024 (byte*) print_screen diff --git a/src/test/ref/sinusgen16b.sym b/src/test/ref/sinusgen16b.sym index bc77561fa..2dd1012fd 100644 --- a/src/test/ref/sinusgen16b.sym +++ b/src/test/ref/sinusgen16b.sym @@ -81,8 +81,8 @@ (signed word*) main::st2 (signed word*) main::st2#1 st2 zp[2]:11 7.333333333333333 (signed word*) main::st2#2 st2 zp[2]:11 3.0 -(const byte*) main::str[(byte) 4] = (string) " " -(const byte*) main::str1[(byte) 2] = (string) " " +(const byte*) main::str[(byte) 4] = (byte*) " " +(const byte*) main::str1[(byte) 2] = (byte*) " " (signed word) main::sw (signed word) main::sw#0 sw zp[2]:25 6.6000000000000005 (const word) main::wavelength = (word) $78 @@ -191,7 +191,7 @@ (byte*) print_char_cursor#54 print_char_cursor zp[2]:31 24.0 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (const byte*) print_line_cursor#0 print_line_cursor = (byte*) 1024 (byte*) print_screen diff --git a/src/test/ref/sinusgen8.log b/src/test/ref/sinusgen8.log index 8bfc86a6c..6a621d3cb 100644 --- a/src/test/ref/sinusgen8.log +++ b/src/test/ref/sinusgen8.log @@ -828,7 +828,7 @@ SYMBOL TABLE SSA (byte) main::i#4 (signed byte) main::sb (signed byte) main::sb#0 -(const byte*) main::str[(byte) 3] = (string) " " +(const byte*) main::str[(byte) 3] = (byte*) " " (void*()) memset((void*) memset::str , (byte) memset::c , (word) memset::num) (bool~) memset::$0 (bool~) memset::$1 @@ -1028,7 +1028,7 @@ SYMBOL TABLE SSA (void()) print_cls() (label) print_cls::@1 (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#0 (byte*) print_line_cursor#1 @@ -4864,7 +4864,7 @@ FINAL SYMBOL TABLE (byte) main::i#2 reg byte x 5.5 (signed byte) main::sb (signed byte) main::sb#0 reg byte a 22.0 -(const byte*) main::str[(byte) 3] = (string) " " +(const byte*) main::str[(byte) 3] = (byte*) " " (void*()) memset((void*) memset::str , (byte) memset::c , (word) memset::num) (label) memset::@1 (label) memset::@2 @@ -4952,7 +4952,7 @@ FINAL SYMBOL TABLE (byte*) print_char_cursor#42 print_char_cursor zp[2]:2 2.5 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (const byte*) print_line_cursor#0 print_line_cursor = (byte*) 1024 (void()) print_sbyte((signed byte) print_sbyte::b) diff --git a/src/test/ref/sinusgen8.sym b/src/test/ref/sinusgen8.sym index 06bd8466a..2cb93ec65 100644 --- a/src/test/ref/sinusgen8.sym +++ b/src/test/ref/sinusgen8.sym @@ -57,7 +57,7 @@ (byte) main::i#2 reg byte x 5.5 (signed byte) main::sb (signed byte) main::sb#0 reg byte a 22.0 -(const byte*) main::str[(byte) 3] = (string) " " +(const byte*) main::str[(byte) 3] = (byte*) " " (void*()) memset((void*) memset::str , (byte) memset::c , (word) memset::num) (label) memset::@1 (label) memset::@2 @@ -145,7 +145,7 @@ (byte*) print_char_cursor#42 print_char_cursor zp[2]:2 2.5 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (const byte*) print_line_cursor#0 print_line_cursor = (byte*) 1024 (void()) print_sbyte((signed byte) print_sbyte::b) diff --git a/src/test/ref/sinusgen8b.log b/src/test/ref/sinusgen8b.log index cf7cf43a5..a2b4d7238 100644 --- a/src/test/ref/sinusgen8b.log +++ b/src/test/ref/sinusgen8b.log @@ -1246,7 +1246,7 @@ SYMBOL TABLE SSA (signed byte) main::sd#0 (const signed byte*) main::sintabb[(number) $c0] = { fill( $c0, 0) } (const signed word*) main::sintabw[(number) $c0] = { fill( $c0, 0) } -(const byte*) main::str[(byte) 3] = (string) " " +(const byte*) main::str[(byte) 3] = (byte*) " " (signed word) main::sw (signed word) main::sw#0 (const word) main::wavelength = (word) $c0 @@ -1538,7 +1538,7 @@ SYMBOL TABLE SSA (void()) print_cls() (label) print_cls::@1 (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#0 (byte*) print_line_cursor#1 @@ -8139,7 +8139,7 @@ FINAL SYMBOL TABLE (signed byte) main::sd#0 reg byte a 22.0 (const signed byte*) main::sintabb[(number) $c0] = { fill( $c0, 0) } (const signed word*) main::sintabw[(number) $c0] = { fill( $c0, 0) } -(const byte*) main::str[(byte) 3] = (string) " " +(const byte*) main::str[(byte) 3] = (byte*) " " (signed word) main::sw (signed word) main::sw#0 sw zp[2]:20 22.0 (const word) main::wavelength = (word) $c0 @@ -8280,7 +8280,7 @@ FINAL SYMBOL TABLE (byte*) print_char_cursor#42 print_char_cursor zp[2]:17 1.25 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (const byte*) print_line_cursor#0 print_line_cursor = (byte*) 1024 (void()) print_sbyte((signed byte) print_sbyte::b) diff --git a/src/test/ref/sinusgen8b.sym b/src/test/ref/sinusgen8b.sym index 23f8171fb..f53b5b2a6 100644 --- a/src/test/ref/sinusgen8b.sym +++ b/src/test/ref/sinusgen8b.sym @@ -90,7 +90,7 @@ (signed byte) main::sd#0 reg byte a 22.0 (const signed byte*) main::sintabb[(number) $c0] = { fill( $c0, 0) } (const signed word*) main::sintabw[(number) $c0] = { fill( $c0, 0) } -(const byte*) main::str[(byte) 3] = (string) " " +(const byte*) main::str[(byte) 3] = (byte*) " " (signed word) main::sw (signed word) main::sw#0 sw zp[2]:20 22.0 (const word) main::wavelength = (word) $c0 @@ -231,7 +231,7 @@ (byte*) print_char_cursor#42 print_char_cursor zp[2]:17 1.25 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (const byte*) print_line_cursor#0 print_line_cursor = (byte*) 1024 (void()) print_sbyte((signed byte) print_sbyte::b) diff --git a/src/test/ref/sinusgenscale8.log b/src/test/ref/sinusgenscale8.log index 8184b480c..2bc337f75 100644 --- a/src/test/ref/sinusgenscale8.log +++ b/src/test/ref/sinusgenscale8.log @@ -1588,7 +1588,7 @@ SYMBOL TABLE SSA (void()) print_cls() (label) print_cls::@1 (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#0 (byte*) print_line_cursor#1 @@ -2026,15 +2026,15 @@ SYMBOL TABLE SSA (word) sin8u_table::step#7 (word) sin8u_table::step#8 (word) sin8u_table::step#9 -(const byte*) sin8u_table::str[(byte) 6] = (string) "step:" -(const byte*) sin8u_table::str1[(byte) 6] = (string) " min:" -(const byte*) sin8u_table::str2[(byte) 6] = (string) " max:" -(const byte*) sin8u_table::str3[(byte) 7] = (string) " ampl:" -(const byte*) sin8u_table::str4[(byte) 6] = (string) " mid:" -(const byte*) sin8u_table::str5[(byte) 4] = (string) "x: " -(const byte*) sin8u_table::str6[(byte) 7] = (string) " sin: " -(const byte*) sin8u_table::str7[(byte) $a] = (string) " scaled: " -(const byte*) sin8u_table::str8[(byte) 9] = (string) " trans: " +(const byte*) sin8u_table::str[(byte) 6] = (byte*) "step:" +(const byte*) sin8u_table::str1[(byte) 6] = (byte*) " min:" +(const byte*) sin8u_table::str2[(byte) 6] = (byte*) " max:" +(const byte*) sin8u_table::str3[(byte) 7] = (byte*) " ampl:" +(const byte*) sin8u_table::str4[(byte) 6] = (byte*) " mid:" +(const byte*) sin8u_table::str5[(byte) 4] = (byte*) "x: " +(const byte*) sin8u_table::str6[(byte) 7] = (byte*) " sin: " +(const byte*) sin8u_table::str7[(byte) $a] = (byte*) " scaled: " +(const byte*) sin8u_table::str8[(byte) 9] = (byte*) " trans: " (word) sin8u_table::sum (word) sin8u_table::sum#0 (word) sin8u_table::tabsize @@ -7392,7 +7392,7 @@ FINAL SYMBOL TABLE (byte*) print_char_cursor#66 print_char_cursor zp[2]:6 8.0 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:2 8.783783783783784 (byte*) print_line_cursor#12 print_line_cursor zp[2]:2 204.0 @@ -7537,15 +7537,15 @@ FINAL SYMBOL TABLE (byte) sin8u_table::sinx_tr#0 reg byte x 1.9411764705882355 (word) sin8u_table::step (word) sin8u_table::step#0 step zp[2]:15 0.2727272727272727 -(const byte*) sin8u_table::str[(byte) 6] = (string) "step:" -(const byte*) sin8u_table::str1[(byte) 6] = (string) " min:" -(const byte*) sin8u_table::str2[(byte) 6] = (string) " max:" -(const byte*) sin8u_table::str3[(byte) 7] = (string) " ampl:" -(const byte*) sin8u_table::str4[(byte) 6] = (string) " mid:" -(const byte*) sin8u_table::str5[(byte) 4] = (string) "x: " -(const byte*) sin8u_table::str6[(byte) 7] = (string) " sin: " -(const byte*) sin8u_table::str7[(byte) $a] = (string) " scaled: " -(const byte*) sin8u_table::str8[(byte) 9] = (string) " trans: " +(const byte*) sin8u_table::str[(byte) 6] = (byte*) "step:" +(const byte*) sin8u_table::str1[(byte) 6] = (byte*) " min:" +(const byte*) sin8u_table::str2[(byte) 6] = (byte*) " max:" +(const byte*) sin8u_table::str3[(byte) 7] = (byte*) " ampl:" +(const byte*) sin8u_table::str4[(byte) 6] = (byte*) " mid:" +(const byte*) sin8u_table::str5[(byte) 4] = (byte*) "x: " +(const byte*) sin8u_table::str6[(byte) 7] = (byte*) " sin: " +(const byte*) sin8u_table::str7[(byte) $a] = (byte*) " scaled: " +(const byte*) sin8u_table::str8[(byte) 9] = (byte*) " trans: " (word) sin8u_table::sum (const word) sin8u_table::sum#0 sum = (word)(const byte) sin8u_table::min#0+(const byte) sin8u_table::max#0 (word) sin8u_table::tabsize diff --git a/src/test/ref/sinusgenscale8.sym b/src/test/ref/sinusgenscale8.sym index 3d8dbd957..c37900ce4 100644 --- a/src/test/ref/sinusgenscale8.sym +++ b/src/test/ref/sinusgenscale8.sym @@ -165,7 +165,7 @@ (byte*) print_char_cursor#66 print_char_cursor zp[2]:6 8.0 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:2 8.783783783783784 (byte*) print_line_cursor#12 print_line_cursor zp[2]:2 204.0 @@ -310,15 +310,15 @@ (byte) sin8u_table::sinx_tr#0 reg byte x 1.9411764705882355 (word) sin8u_table::step (word) sin8u_table::step#0 step zp[2]:15 0.2727272727272727 -(const byte*) sin8u_table::str[(byte) 6] = (string) "step:" -(const byte*) sin8u_table::str1[(byte) 6] = (string) " min:" -(const byte*) sin8u_table::str2[(byte) 6] = (string) " max:" -(const byte*) sin8u_table::str3[(byte) 7] = (string) " ampl:" -(const byte*) sin8u_table::str4[(byte) 6] = (string) " mid:" -(const byte*) sin8u_table::str5[(byte) 4] = (string) "x: " -(const byte*) sin8u_table::str6[(byte) 7] = (string) " sin: " -(const byte*) sin8u_table::str7[(byte) $a] = (string) " scaled: " -(const byte*) sin8u_table::str8[(byte) 9] = (string) " trans: " +(const byte*) sin8u_table::str[(byte) 6] = (byte*) "step:" +(const byte*) sin8u_table::str1[(byte) 6] = (byte*) " min:" +(const byte*) sin8u_table::str2[(byte) 6] = (byte*) " max:" +(const byte*) sin8u_table::str3[(byte) 7] = (byte*) " ampl:" +(const byte*) sin8u_table::str4[(byte) 6] = (byte*) " mid:" +(const byte*) sin8u_table::str5[(byte) 4] = (byte*) "x: " +(const byte*) sin8u_table::str6[(byte) 7] = (byte*) " sin: " +(const byte*) sin8u_table::str7[(byte) $a] = (byte*) " scaled: " +(const byte*) sin8u_table::str8[(byte) 9] = (byte*) " trans: " (word) sin8u_table::sum (const word) sin8u_table::sum#0 sum = (word)(const byte) sin8u_table::min#0+(const byte) sin8u_table::max#0 (word) sin8u_table::tabsize diff --git a/src/test/ref/sizeof-arrays.log b/src/test/ref/sizeof-arrays.log index bd6cd3d7b..c4430d34d 100644 --- a/src/test/ref/sizeof-arrays.log +++ b/src/test/ref/sizeof-arrays.log @@ -85,7 +85,7 @@ SYMBOL TABLE SSA (byte) main::idx#4 (byte) main::idx#5 (byte) main::idx#6 -(const byte*) main::sa[] = (string) "camelot" +(const byte*) main::sa[] = (byte*) "camelot" (const byte*) main::sb[] = { (byte) 'a', (byte) 'b', (byte) 'c', (byte) 0 } (const byte) main::sz = (byte) 7 (const word*) main::wa[(number) 3] = { fill( 3, 0) } diff --git a/src/test/ref/string-const-consolidation-noroot.log b/src/test/ref/string-const-consolidation-noroot.log index 097981e89..acc79b4d8 100644 --- a/src/test/ref/string-const-consolidation-noroot.log +++ b/src/test/ref/string-const-consolidation-noroot.log @@ -81,9 +81,9 @@ SYMBOL TABLE SSA (label) main::@2 (label) main::@3 (label) main::@return -(const byte*) main::rex1[] = (string) "rex" -(const byte*) main::rex2[] = (string) "rex" -(const byte*) main::string[(byte) 4] = (string) "rex" +(const byte*) main::rex1[] = (byte*) "rex" +(const byte*) main::rex2[] = (byte*) "rex" +(const byte*) main::string[(byte) 4] = (byte*) "rex" (void()) print((byte*) print::string) (bool~) print::$0 (label) print::@1 @@ -543,7 +543,7 @@ FINAL SYMBOL TABLE (label) main::@1 (label) main::@2 (label) main::@return -(const byte*) main::rex1[] = (string) "rex" +(const byte*) main::rex1[] = (byte*) "rex" (void()) print((byte*) print::string) (label) print::@1 (label) print::@2 diff --git a/src/test/ref/string-const-consolidation-noroot.sym b/src/test/ref/string-const-consolidation-noroot.sym index f75890c06..ff02d1050 100644 --- a/src/test/ref/string-const-consolidation-noroot.sym +++ b/src/test/ref/string-const-consolidation-noroot.sym @@ -5,7 +5,7 @@ (label) main::@1 (label) main::@2 (label) main::@return -(const byte*) main::rex1[] = (string) "rex" +(const byte*) main::rex1[] = (byte*) "rex" (void()) print((byte*) print::string) (label) print::@1 (label) print::@2 diff --git a/src/test/ref/string-const-consolidation.log b/src/test/ref/string-const-consolidation.log index 4c60f4a89..55f48b984 100644 --- a/src/test/ref/string-const-consolidation.log +++ b/src/test/ref/string-const-consolidation.log @@ -81,8 +81,8 @@ SYMBOL TABLE SSA (label) main::@2 (label) main::@3 (label) main::@return -(const byte*) main::rex2[] = (string) "rex" -(const byte*) main::string[(byte) 4] = (string) "rex" +(const byte*) main::rex2[] = (byte*) "rex" +(const byte*) main::string[(byte) 4] = (byte*) "rex" (void()) print((byte*) print::string) (bool~) print::$0 (label) print::@1 @@ -96,7 +96,7 @@ SYMBOL TABLE SSA (byte*) print::string#4 (byte*) print::string#5 (byte*) print::string#6 -(const byte*) rex1[] = (string) "rex" +(const byte*) rex1[] = (byte*) "rex" (byte*) screen (byte*) screen#0 (byte*) screen#1 @@ -550,7 +550,7 @@ FINAL SYMBOL TABLE (byte*) print::string (byte*) print::string#3 string zp[2]:4 22.0 (byte*) print::string#4 string zp[2]:4 11.0 -(const byte*) rex1[] = (string) "rex" +(const byte*) rex1[] = (byte*) "rex" (byte*) screen (byte*) screen#12 screen zp[2]:2 4.875 (byte*) screen#18 screen zp[2]:2 6.0 diff --git a/src/test/ref/string-const-consolidation.sym b/src/test/ref/string-const-consolidation.sym index 31a246e71..164f3e06e 100644 --- a/src/test/ref/string-const-consolidation.sym +++ b/src/test/ref/string-const-consolidation.sym @@ -12,7 +12,7 @@ (byte*) print::string (byte*) print::string#3 string zp[2]:4 22.0 (byte*) print::string#4 string zp[2]:4 11.0 -(const byte*) rex1[] = (string) "rex" +(const byte*) rex1[] = (byte*) "rex" (byte*) screen (byte*) screen#12 screen zp[2]:2 4.875 (byte*) screen#18 screen zp[2]:2 6.0 diff --git a/src/test/ref/string-encoding-literals.log b/src/test/ref/string-encoding-literals.log index a6f0643a4..7195b02e0 100644 --- a/src/test/ref/string-encoding-literals.log +++ b/src/test/ref/string-encoding-literals.log @@ -60,13 +60,13 @@ SYMBOL TABLE SSA (byte) main::i#0 (byte) main::i#1 (byte) main::i#2 -(const byte*) petscii_mixed[] = (string) "abcABC1"pm -(const byte*) petscii_standard[] = (string) "abcABC3"pm -(const byte*) petscii_upper[] = (string) "abcABC2"pu -(const byte*) screencode_mixed[] = (string) "abcABC4" -(const byte*) screencode_standard[] = (string) "abcABC6" -(const byte*) screencode_upper[] = (string) "abcABC5"su -(const byte*) standard[] = (string) "abcABC7" +(const byte*) petscii_mixed[] = (byte*) "abcABC1"pm +(const byte*) petscii_standard[] = (byte*) "abcABC3"pm +(const byte*) petscii_upper[] = (byte*) "abcABC2"pu +(const byte*) screencode_mixed[] = (byte*) "abcABC4" +(const byte*) screencode_standard[] = (byte*) "abcABC6" +(const byte*) screencode_upper[] = (byte*) "abcABC5"su +(const byte*) standard[] = (byte*) "abcABC7" Adding number conversion cast (unumber) $28*0 in (byte*~) main::$0 ← (const byte*) main::SCREEN + (number) $28*(number) 0 Adding number conversion cast (unumber) $28*1 in (byte*~) main::$1 ← (const byte*) main::SCREEN + (number) $28*(number) 1 @@ -439,13 +439,13 @@ FINAL SYMBOL TABLE (byte) main::i (byte) main::i#1 reg byte x 16.5 (byte) main::i#2 reg byte x 22.0 -(const byte*) petscii_mixed[] = (string) "abcABC1"pm -(const byte*) petscii_standard[] = (string) "abcABC3"pm -(const byte*) petscii_upper[] = (string) "abcABC2"pu -(const byte*) screencode_mixed[] = (string) "abcABC4" -(const byte*) screencode_standard[] = (string) "abcABC6" -(const byte*) screencode_upper[] = (string) "abcABC5"su -(const byte*) standard[] = (string) "abcABC7" +(const byte*) petscii_mixed[] = (byte*) "abcABC1"pm +(const byte*) petscii_standard[] = (byte*) "abcABC3"pm +(const byte*) petscii_upper[] = (byte*) "abcABC2"pu +(const byte*) screencode_mixed[] = (byte*) "abcABC4" +(const byte*) screencode_standard[] = (byte*) "abcABC6" +(const byte*) screencode_upper[] = (byte*) "abcABC5"su +(const byte*) standard[] = (byte*) "abcABC7" reg byte x [ main::i#2 main::i#1 ] diff --git a/src/test/ref/string-encoding-literals.sym b/src/test/ref/string-encoding-literals.sym index 870859a1d..0ae63d8e0 100644 --- a/src/test/ref/string-encoding-literals.sym +++ b/src/test/ref/string-encoding-literals.sym @@ -8,12 +8,12 @@ (byte) main::i (byte) main::i#1 reg byte x 16.5 (byte) main::i#2 reg byte x 22.0 -(const byte*) petscii_mixed[] = (string) "abcABC1"pm -(const byte*) petscii_standard[] = (string) "abcABC3"pm -(const byte*) petscii_upper[] = (string) "abcABC2"pu -(const byte*) screencode_mixed[] = (string) "abcABC4" -(const byte*) screencode_standard[] = (string) "abcABC6" -(const byte*) screencode_upper[] = (string) "abcABC5"su -(const byte*) standard[] = (string) "abcABC7" +(const byte*) petscii_mixed[] = (byte*) "abcABC1"pm +(const byte*) petscii_standard[] = (byte*) "abcABC3"pm +(const byte*) petscii_upper[] = (byte*) "abcABC2"pu +(const byte*) screencode_mixed[] = (byte*) "abcABC4" +(const byte*) screencode_standard[] = (byte*) "abcABC6" +(const byte*) screencode_upper[] = (byte*) "abcABC5"su +(const byte*) standard[] = (byte*) "abcABC7" reg byte x [ main::i#2 main::i#1 ] diff --git a/src/test/ref/string-encoding-pragma.log b/src/test/ref/string-encoding-pragma.log index 484ab11a7..ea92f340b 100644 --- a/src/test/ref/string-encoding-pragma.log +++ b/src/test/ref/string-encoding-pragma.log @@ -57,12 +57,12 @@ SYMBOL TABLE SSA (byte) main::i#0 (byte) main::i#1 (byte) main::i#2 -(const byte*) petscii_mixed1[] = (string) "abcABC2"pm -(const byte*) petscii_mixed2[] = (string) "abcABC3"pm -(const byte*) screencode_mixed1[] = (string) "abcABC1" -(const byte*) screencode_mixed2[] = (string) "abcABC4" -(const byte*) screencode_mixed3[] = (string) "abcABC6" -(const byte*) screencode_upper[] = (string) "abcABC5"su +(const byte*) petscii_mixed1[] = (byte*) "abcABC2"pm +(const byte*) petscii_mixed2[] = (byte*) "abcABC3"pm +(const byte*) screencode_mixed1[] = (byte*) "abcABC1" +(const byte*) screencode_mixed2[] = (byte*) "abcABC4" +(const byte*) screencode_mixed3[] = (byte*) "abcABC6" +(const byte*) screencode_upper[] = (byte*) "abcABC5"su Adding number conversion cast (unumber) $28*2 in (byte*~) main::$0 ← (const byte*) main::SCREEN + (number) $28*(number) 2 Adding number conversion cast (unumber) $28*0 in (byte*~) main::$1 ← (const byte*) main::SCREEN + (number) $28*(number) 0 @@ -417,12 +417,12 @@ FINAL SYMBOL TABLE (byte) main::i (byte) main::i#1 reg byte x 16.5 (byte) main::i#2 reg byte x 22.000000000000004 -(const byte*) petscii_mixed1[] = (string) "abcABC2"pm -(const byte*) petscii_mixed2[] = (string) "abcABC3"pm -(const byte*) screencode_mixed1[] = (string) "abcABC1" -(const byte*) screencode_mixed2[] = (string) "abcABC4" -(const byte*) screencode_mixed3[] = (string) "abcABC6" -(const byte*) screencode_upper[] = (string) "abcABC5"su +(const byte*) petscii_mixed1[] = (byte*) "abcABC2"pm +(const byte*) petscii_mixed2[] = (byte*) "abcABC3"pm +(const byte*) screencode_mixed1[] = (byte*) "abcABC1" +(const byte*) screencode_mixed2[] = (byte*) "abcABC4" +(const byte*) screencode_mixed3[] = (byte*) "abcABC6" +(const byte*) screencode_upper[] = (byte*) "abcABC5"su reg byte x [ main::i#2 main::i#1 ] diff --git a/src/test/ref/string-encoding-pragma.sym b/src/test/ref/string-encoding-pragma.sym index a91eb6377..19b855ed8 100644 --- a/src/test/ref/string-encoding-pragma.sym +++ b/src/test/ref/string-encoding-pragma.sym @@ -8,11 +8,11 @@ (byte) main::i (byte) main::i#1 reg byte x 16.5 (byte) main::i#2 reg byte x 22.000000000000004 -(const byte*) petscii_mixed1[] = (string) "abcABC2"pm -(const byte*) petscii_mixed2[] = (string) "abcABC3"pm -(const byte*) screencode_mixed1[] = (string) "abcABC1" -(const byte*) screencode_mixed2[] = (string) "abcABC4" -(const byte*) screencode_mixed3[] = (string) "abcABC6" -(const byte*) screencode_upper[] = (string) "abcABC5"su +(const byte*) petscii_mixed1[] = (byte*) "abcABC2"pm +(const byte*) petscii_mixed2[] = (byte*) "abcABC3"pm +(const byte*) screencode_mixed1[] = (byte*) "abcABC1" +(const byte*) screencode_mixed2[] = (byte*) "abcABC4" +(const byte*) screencode_mixed3[] = (byte*) "abcABC6" +(const byte*) screencode_upper[] = (byte*) "abcABC5"su reg byte x [ main::i#2 main::i#1 ] diff --git a/src/test/ref/string-escapes-0.log b/src/test/ref/string-escapes-0.log index f5084cf36..504b1e23a 100644 --- a/src/test/ref/string-escapes-0.log +++ b/src/test/ref/string-escapes-0.log @@ -38,7 +38,7 @@ SYMBOL TABLE SSA (label) @2 (label) @begin (label) @end -(const byte*) MESSAGE[] = (string) " +(const byte*) MESSAGE[] = (byte*) " "'\" (const byte*) SCREEN = (byte*)(number) $400 (void()) main() @@ -290,7 +290,7 @@ FINAL SYMBOL TABLE (label) @1 (label) @begin (label) @end -(const byte*) MESSAGE[] = (string) " +(const byte*) MESSAGE[] = (byte*) " "'\" (const byte*) SCREEN = (byte*) 1024 (void()) main() diff --git a/src/test/ref/string-escapes-0.sym b/src/test/ref/string-escapes-0.sym index 4543aa4a5..099532a95 100644 --- a/src/test/ref/string-escapes-0.sym +++ b/src/test/ref/string-escapes-0.sym @@ -1,7 +1,7 @@ (label) @1 (label) @begin (label) @end -(const byte*) MESSAGE[] = (string) " +(const byte*) MESSAGE[] = (byte*) " "'\" (const byte*) SCREEN = (byte*) 1024 (void()) main() diff --git a/src/test/ref/string-escapes-1.log b/src/test/ref/string-escapes-1.log index b8ff69185..c873169d5 100644 --- a/src/test/ref/string-escapes-1.log +++ b/src/test/ref/string-escapes-1.log @@ -66,7 +66,7 @@ SYMBOL TABLE SSA (label) @2 (label) @begin (label) @end -(const byte*) MESSAGE[] = (string) "hello +(const byte*) MESSAGE[] = (byte*) "hello world" (void()) main() (bool~) main::$0 @@ -519,7 +519,7 @@ FINAL SYMBOL TABLE (label) @1 (label) @begin (label) @end -(const byte*) MESSAGE[] = (string) "hello +(const byte*) MESSAGE[] = (byte*) "hello world" (void()) main() (label) main::@1 diff --git a/src/test/ref/string-escapes-1.sym b/src/test/ref/string-escapes-1.sym index d7959aeb0..31c3edad8 100644 --- a/src/test/ref/string-escapes-1.sym +++ b/src/test/ref/string-escapes-1.sym @@ -1,7 +1,7 @@ (label) @1 (label) @begin (label) @end -(const byte*) MESSAGE[] = (string) "hello +(const byte*) MESSAGE[] = (byte*) "hello world" (void()) main() (label) main::@1 diff --git a/src/test/ref/string-escapes-2.log b/src/test/ref/string-escapes-2.log index df9d3946e..4d9f77cf8 100644 --- a/src/test/ref/string-escapes-2.log +++ b/src/test/ref/string-escapes-2.log @@ -52,7 +52,7 @@ SYMBOL TABLE SSA (label) @3 (label) @begin (label) @end -(const byte*) MESSAGE[] = (string) "hello +(const byte*) MESSAGE[] = (byte*) "hello world\"pm (void()) chrout((byte) chrout::c) (label) chrout::@return @@ -393,7 +393,7 @@ FINAL SYMBOL TABLE (label) @1 (label) @begin (label) @end -(const byte*) MESSAGE[] = (string) "hello +(const byte*) MESSAGE[] = (byte*) "hello world\"pm (void()) chrout((byte) chrout::c) (label) chrout::@return diff --git a/src/test/ref/string-escapes-2.sym b/src/test/ref/string-escapes-2.sym index 238c6ea70..513d2d4f5 100644 --- a/src/test/ref/string-escapes-2.sym +++ b/src/test/ref/string-escapes-2.sym @@ -1,7 +1,7 @@ (label) @1 (label) @begin (label) @end -(const byte*) MESSAGE[] = (string) "hello +(const byte*) MESSAGE[] = (byte*) "hello world\"pm (void()) chrout((byte) chrout::c) (label) chrout::@return diff --git a/src/test/ref/string-escapes-3.log b/src/test/ref/string-escapes-3.log index cdcbacc20..966970f4e 100644 --- a/src/test/ref/string-escapes-3.log +++ b/src/test/ref/string-escapes-3.log @@ -67,7 +67,7 @@ SYMBOL TABLE SSA (label) @2 (label) @begin (label) @end -(const byte*) MESSAGE[] = (string) "hello +(const byte*) MESSAGE[] = (byte*) "hello world"pm (void()) main() (number~) main::$0 @@ -544,7 +544,7 @@ FINAL SYMBOL TABLE (label) @1 (label) @begin (label) @end -(const byte*) MESSAGE[] = (string) "hello +(const byte*) MESSAGE[] = (byte*) "hello world"pm (void()) main() (byte~) main::$0 reg byte a 22.0 diff --git a/src/test/ref/string-escapes-3.sym b/src/test/ref/string-escapes-3.sym index 4af872800..177b5eaec 100644 --- a/src/test/ref/string-escapes-3.sym +++ b/src/test/ref/string-escapes-3.sym @@ -1,7 +1,7 @@ (label) @1 (label) @begin (label) @end -(const byte*) MESSAGE[] = (string) "hello +(const byte*) MESSAGE[] = (byte*) "hello world"pm (void()) main() (byte~) main::$0 reg byte a 22.0 diff --git a/src/test/ref/string-pointer-problem.log b/src/test/ref/string-pointer-problem.log index 558e051da..4c92d3da2 100644 --- a/src/test/ref/string-pointer-problem.log +++ b/src/test/ref/string-pointer-problem.log @@ -55,7 +55,7 @@ SYMBOL TABLE SSA (void()) main() (label) main::@1 (label) main::@return -(const byte*) main::name[(byte) 9] = (string) "keyboard" +(const byte*) main::name[(byte) 9] = (byte*) "keyboard" (const byte*) process_name = (byte*)(number) $400 (void()) set_process_name((byte*) set_process_name::name) (bool~) set_process_name::$0 @@ -446,7 +446,7 @@ FINAL SYMBOL TABLE (label) @end (void()) main() (label) main::@return -(const byte*) main::name[(byte) 9] = (string) "keyboard" +(const byte*) main::name[(byte) 9] = (byte*) "keyboard" (const byte*) process_name = (byte*) 1024 (void()) set_process_name((byte*) set_process_name::name) (byte*~) set_process_name::$1 zp[2]:4 11.0 diff --git a/src/test/ref/string-pointer-problem.sym b/src/test/ref/string-pointer-problem.sym index 7abaf3dce..22571037f 100644 --- a/src/test/ref/string-pointer-problem.sym +++ b/src/test/ref/string-pointer-problem.sym @@ -3,7 +3,7 @@ (label) @end (void()) main() (label) main::@return -(const byte*) main::name[(byte) 9] = (string) "keyboard" +(const byte*) main::name[(byte) 9] = (byte*) "keyboard" (const byte*) process_name = (byte*) 1024 (void()) set_process_name((byte*) set_process_name::name) (byte*~) set_process_name::$1 zp[2]:4 11.0 diff --git a/src/test/ref/strip.log b/src/test/ref/strip.log index e90e65c89..2e2200887 100644 --- a/src/test/ref/strip.log +++ b/src/test/ref/strip.log @@ -117,8 +117,8 @@ SYMBOL TABLE SSA (label) main::@3 (label) main::@4 (label) main::@return -(const byte*) msg1[] = (string) "hello world!" -(const byte*) msg2[] = (string) "goodbye blue sky!" +(const byte*) msg1[] = (byte*) "hello world!" +(const byte*) msg2[] = (byte*) "goodbye blue sky!" (void()) print((byte*) print::msg) (bool~) print::$0 (label) print::@1 @@ -933,8 +933,8 @@ FINAL SYMBOL TABLE (label) main::@2 (label) main::@3 (label) main::@return -(const byte*) msg1[] = (string) "hello world!" -(const byte*) msg2[] = (string) "goodbye blue sky!" +(const byte*) msg1[] = (byte*) "hello world!" +(const byte*) msg2[] = (byte*) "goodbye blue sky!" (void()) print((byte*) print::msg) (label) print::@1 (label) print::@return diff --git a/src/test/ref/strip.sym b/src/test/ref/strip.sym index 076d87026..e7c00557d 100644 --- a/src/test/ref/strip.sym +++ b/src/test/ref/strip.sym @@ -6,8 +6,8 @@ (label) main::@2 (label) main::@3 (label) main::@return -(const byte*) msg1[] = (string) "hello world!" -(const byte*) msg2[] = (string) "goodbye blue sky!" +(const byte*) msg1[] = (byte*) "hello world!" +(const byte*) msg2[] = (byte*) "goodbye blue sky!" (void()) print((byte*) print::msg) (label) print::@1 (label) print::@return diff --git a/src/test/ref/struct-11.log b/src/test/ref/struct-11.log index 40914109e..37a140eb2 100644 --- a/src/test/ref/struct-11.log +++ b/src/test/ref/struct-11.log @@ -100,13 +100,13 @@ SYMBOL TABLE SSA (label) @3 (label) @begin (label) @end -(const byte*) DIGIT[] = (string) "0123456789" +(const byte*) DIGIT[] = (byte*) "0123456789" (const byte) OFFSET_STRUCT_PERSON_ID = (byte) 0 (const byte) OFFSET_STRUCT_PERSON_NAME = (byte) 1 (byte) Person::id (const byte*) Person::name[(number) $40] = { fill( $40, 0) } (const byte*) SCREEN = (byte*)(number) $400 -(struct Person) henriette loadstore = { id: (byte) 7, name: (string) "henriette" } +(struct Person) henriette loadstore = { id: (byte) 7, name: (byte*) "henriette" } (byte) idx (byte) idx#0 (byte) idx#1 @@ -129,7 +129,7 @@ SYMBOL TABLE SSA (byte) idx#7 (byte) idx#8 (byte) idx#9 -(struct Person) jesper loadstore = { id: (byte) 4, name: (string) "jesper" } +(struct Person) jesper loadstore = { id: (byte) 4, name: (byte*) "jesper" } (void()) main() (label) main::@1 (label) main::@2 @@ -281,7 +281,7 @@ print_person::@2: scope:[print_person] from print_person::@1 VARIABLE REGISTER WEIGHTS (byte) Person::id -(struct Person) henriette loadstore = { id: (byte) 7, name: (string) "henriette" } +(struct Person) henriette loadstore = { id: (byte) 7, name: (byte*) "henriette" } (byte) idx (byte) idx#13 3.0 (byte) idx#14 9.75 @@ -289,7 +289,7 @@ VARIABLE REGISTER WEIGHTS (byte) idx#4 3.0 (byte) idx#5 4.0 (byte) idx#6 11.0 -(struct Person) jesper loadstore = { id: (byte) 4, name: (string) "jesper" } +(struct Person) jesper loadstore = { id: (byte) 4, name: (byte*) "jesper" } (void()) main() (void()) print_person((byte) print_person::person_id , (byte*) print_person::person_name) (byte) print_person::i @@ -683,12 +683,12 @@ FINAL SYMBOL TABLE (label) @1 (label) @begin (label) @end -(const byte*) DIGIT[] = (string) "0123456789" +(const byte*) DIGIT[] = (byte*) "0123456789" (const byte) OFFSET_STRUCT_PERSON_NAME = (byte) 1 (byte) Person::id (const byte*) Person::name[(number) $40] = { fill( $40, 0) } (const byte*) SCREEN = (byte*) 1024 -(struct Person) henriette loadstore mem[65] = { id: (byte) 7, name: (string) "henriette" } +(struct Person) henriette loadstore mem[65] = { id: (byte) 7, name: (byte*) "henriette" } (byte) idx (byte) idx#13 reg byte y 3.0 (byte) idx#14 reg byte x 9.75 @@ -696,7 +696,7 @@ FINAL SYMBOL TABLE (byte) idx#4 reg byte x 3.0 (byte) idx#5 reg byte x 4.0 (byte) idx#6 reg byte x 11.0 -(struct Person) jesper loadstore mem[65] = { id: (byte) 4, name: (string) "jesper" } +(struct Person) jesper loadstore mem[65] = { id: (byte) 4, name: (byte*) "jesper" } (void()) main() (label) main::@1 (label) main::@return diff --git a/src/test/ref/struct-11.sym b/src/test/ref/struct-11.sym index 2acf8a7df..d59b453b5 100644 --- a/src/test/ref/struct-11.sym +++ b/src/test/ref/struct-11.sym @@ -1,12 +1,12 @@ (label) @1 (label) @begin (label) @end -(const byte*) DIGIT[] = (string) "0123456789" +(const byte*) DIGIT[] = (byte*) "0123456789" (const byte) OFFSET_STRUCT_PERSON_NAME = (byte) 1 (byte) Person::id (const byte*) Person::name[(number) $40] = { fill( $40, 0) } (const byte*) SCREEN = (byte*) 1024 -(struct Person) henriette loadstore mem[65] = { id: (byte) 7, name: (string) "henriette" } +(struct Person) henriette loadstore mem[65] = { id: (byte) 7, name: (byte*) "henriette" } (byte) idx (byte) idx#13 reg byte y 3.0 (byte) idx#14 reg byte x 9.75 @@ -14,7 +14,7 @@ (byte) idx#4 reg byte x 3.0 (byte) idx#5 reg byte x 4.0 (byte) idx#6 reg byte x 11.0 -(struct Person) jesper loadstore mem[65] = { id: (byte) 4, name: (string) "jesper" } +(struct Person) jesper loadstore mem[65] = { id: (byte) 4, name: (byte*) "jesper" } (void()) main() (label) main::@1 (label) main::@return diff --git a/src/test/ref/struct-11b.log b/src/test/ref/struct-11b.log index 0d4ba90eb..4e2747394 100644 --- a/src/test/ref/struct-11b.log +++ b/src/test/ref/struct-11b.log @@ -85,7 +85,7 @@ SYMBOL TABLE SSA (label) @end (const byte*) SCREEN = (byte*)(number) $400 (const dword) henry_id = (dword) $4466d -(const byte*) henry_initials[(number) $40] = (string) "hg" +(const byte*) henry_initials[(number) $40] = (byte*) "hg" (byte) idx (byte) idx#0 (byte) idx#1 @@ -107,7 +107,7 @@ SYMBOL TABLE SSA (byte) idx#8 (byte) idx#9 (const dword) jesper_id = (dword) $1b244 -(const byte*) jesper_initials[(number) $40] = (string) "jg" +(const byte*) jesper_initials[(number) $40] = (byte*) "jg" (void()) main() (label) main::@1 (label) main::@2 @@ -571,13 +571,13 @@ FINAL SYMBOL TABLE (label) @begin (label) @end (const byte*) SCREEN = (byte*) 1024 -(const byte*) henry_initials[(number) $40] = (string) "hg" +(const byte*) henry_initials[(number) $40] = (byte*) "hg" (byte) idx (byte) idx#11 reg byte x 9.75 (byte) idx#13 reg byte x 1.0 (byte) idx#18 reg byte x 4.0 (byte) idx#4 reg byte x 11.0 -(const byte*) jesper_initials[(number) $40] = (string) "jg" +(const byte*) jesper_initials[(number) $40] = (byte*) "jg" (void()) main() (label) main::@1 (label) main::@return diff --git a/src/test/ref/struct-11b.sym b/src/test/ref/struct-11b.sym index 98107ca6d..62e5a8e7f 100644 --- a/src/test/ref/struct-11b.sym +++ b/src/test/ref/struct-11b.sym @@ -2,13 +2,13 @@ (label) @begin (label) @end (const byte*) SCREEN = (byte*) 1024 -(const byte*) henry_initials[(number) $40] = (string) "hg" +(const byte*) henry_initials[(number) $40] = (byte*) "hg" (byte) idx (byte) idx#11 reg byte x 9.75 (byte) idx#13 reg byte x 1.0 (byte) idx#18 reg byte x 4.0 (byte) idx#4 reg byte x 11.0 -(const byte*) jesper_initials[(number) $40] = (string) "jg" +(const byte*) jesper_initials[(number) $40] = (byte*) "jg" (void()) main() (label) main::@1 (label) main::@return diff --git a/src/test/ref/struct-12.log b/src/test/ref/struct-12.log index 3d4a6743c..21037b714 100644 --- a/src/test/ref/struct-12.log +++ b/src/test/ref/struct-12.log @@ -13,11 +13,11 @@ Created struct value member variable (byte) print_person::person_id Created struct value member variable (byte*) print_person::person_name Converted struct value to member variables (struct Person) print_person::person Converted procedure struct value parameter to member unwinding (void()) print_person((byte) print_person::person_id , (byte*) print_person::person_name) -Unwinding value copy (struct Person) main::jesper ← { id: (byte) 4, name: (string) "jesper" } +Unwinding value copy (struct Person) main::jesper ← { id: (byte) 4, name: (byte*) "jesper" } Adding value simple copy (byte) main::jesper_id ← (byte) 4 Adding value bulk copy *((const byte*) main::jesper_name) ← memcpy(*(&(const byte*) $0), byte, (number) $40) Converted procedure struct value parameter to member unwinding in call (void~) main::$0 ← call print_person (byte) main::jesper_id (const byte*) main::jesper_name -Unwinding value copy (struct Person) main::henriette ← { id: (byte) 7, name: (string) "henriette" } +Unwinding value copy (struct Person) main::henriette ← { id: (byte) 7, name: (byte*) "henriette" } Adding value simple copy (byte) main::henriette_id ← (byte) 7 Adding value bulk copy *((const byte*) main::henriette_name) ← memcpy(*(&(const byte*) $1), byte, (number) $40) Converted procedure struct value parameter to member unwinding in call (void~) main::$1 ← call print_person (byte) main::henriette_id (const byte*) main::henriette_name @@ -111,14 +111,14 @@ print_person::@return: scope:[print_person] from print_person::@3 @end: scope:[] from @3 SYMBOL TABLE SSA -(const byte*) $0[(number) $40] = (string) "jesper" -(const byte*) $1[(number) $40] = (string) "henriette" +(const byte*) $0[(number) $40] = (byte*) "jesper" +(const byte*) $1[(number) $40] = (byte*) "henriette" (label) @1 (label) @2 (label) @3 (label) @begin (label) @end -(const byte*) DIGIT[] = (string) "0123456789" +(const byte*) DIGIT[] = (byte*) "0123456789" (byte) Person::id (const byte*) Person::name[(number) $40] = { fill( $40, 0) } (const byte*) SCREEN = (byte*)(number) $400 @@ -722,12 +722,12 @@ Removing instruction __b1: Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE -(const byte*) $0[(number) $40] = (string) "jesper" -(const byte*) $1[(number) $40] = (string) "henriette" +(const byte*) $0[(number) $40] = (byte*) "jesper" +(const byte*) $1[(number) $40] = (byte*) "henriette" (label) @1 (label) @begin (label) @end -(const byte*) DIGIT[] = (string) "0123456789" +(const byte*) DIGIT[] = (byte*) "0123456789" (byte) Person::id (const byte*) Person::name[(number) $40] = { fill( $40, 0) } (const byte*) SCREEN = (byte*) 1024 diff --git a/src/test/ref/struct-12.sym b/src/test/ref/struct-12.sym index 9b5278b9a..45b44fb73 100644 --- a/src/test/ref/struct-12.sym +++ b/src/test/ref/struct-12.sym @@ -1,9 +1,9 @@ -(const byte*) $0[(number) $40] = (string) "jesper" -(const byte*) $1[(number) $40] = (string) "henriette" +(const byte*) $0[(number) $40] = (byte*) "jesper" +(const byte*) $1[(number) $40] = (byte*) "henriette" (label) @1 (label) @begin (label) @end -(const byte*) DIGIT[] = (string) "0123456789" +(const byte*) DIGIT[] = (byte*) "0123456789" (byte) Person::id (const byte*) Person::name[(number) $40] = { fill( $40, 0) } (const byte*) SCREEN = (byte*) 1024 diff --git a/src/test/ref/struct-27.log b/src/test/ref/struct-27.log index e7449499c..903de30c9 100644 --- a/src/test/ref/struct-27.log +++ b/src/test/ref/struct-27.log @@ -29,7 +29,7 @@ main::@return: scope:[main] from main @end: scope:[] from @2 SYMBOL TABLE SSA -(const struct Point) $0 = { x: (byte) 2, initials: (string) "jg" } +(const struct Point) $0 = { x: (byte) 2, initials: (byte*) "jg" } (label) @1 (label) @2 (label) @begin @@ -269,7 +269,7 @@ Removing instruction __b1: Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE -(const struct Point) $0 = { x: (byte) 2, initials: (string) "jg" } +(const struct Point) $0 = { x: (byte) 2, initials: (byte*) "jg" } (label) @1 (label) @begin (label) @end diff --git a/src/test/ref/struct-27.sym b/src/test/ref/struct-27.sym index ebf96415f..755eb4e13 100644 --- a/src/test/ref/struct-27.sym +++ b/src/test/ref/struct-27.sym @@ -1,4 +1,4 @@ -(const struct Point) $0 = { x: (byte) 2, initials: (string) "jg" } +(const struct Point) $0 = { x: (byte) 2, initials: (byte*) "jg" } (label) @1 (label) @begin (label) @end diff --git a/src/test/ref/struct-30.log b/src/test/ref/struct-30.log index 2860d7206..ab89263bb 100644 --- a/src/test/ref/struct-30.log +++ b/src/test/ref/struct-30.log @@ -4,7 +4,7 @@ Fixing struct type SIZE_OF struct Point to 4 Created struct value member variable (byte) main::point1_x Created struct value member variable (const byte*) main::point1_initials Converted struct value to member variables (struct Point) main::point1 -Unwinding value copy (struct Point) main::point1 ← { x: (byte) 2, initials: (string) "jg" } +Unwinding value copy (struct Point) main::point1 ← { x: (byte) 2, initials: (byte*) "jg" } Adding value simple copy (byte) main::point1_x ← (byte) 2 Adding value bulk copy *((const byte*) main::point1_initials) ← memcpy(*(&(const byte*) $0), byte, (number) 3) Replacing struct member reference (struct Point) main::point1.x with member unwinding reference (byte) main::point1_x @@ -34,7 +34,7 @@ main::@return: scope:[main] from main @end: scope:[] from @2 SYMBOL TABLE SSA -(const byte*) $0[(number) 3] = (string) "jg" +(const byte*) $0[(number) 3] = (byte*) "jg" (label) @1 (label) @2 (label) @begin @@ -259,7 +259,7 @@ Removing instruction __b1: Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE -(const byte*) $0[(number) 3] = (string) "jg" +(const byte*) $0[(number) 3] = (byte*) "jg" (label) @1 (label) @begin (label) @end diff --git a/src/test/ref/struct-30.sym b/src/test/ref/struct-30.sym index 468f3148d..87d650228 100644 --- a/src/test/ref/struct-30.sym +++ b/src/test/ref/struct-30.sym @@ -1,4 +1,4 @@ -(const byte*) $0[(number) 3] = (string) "jg" +(const byte*) $0[(number) 3] = (byte*) "jg" (label) @1 (label) @begin (label) @end diff --git a/src/test/ref/struct-36.log b/src/test/ref/struct-36.log index 1f98c2c13..a61581c00 100644 --- a/src/test/ref/struct-36.log +++ b/src/test/ref/struct-36.log @@ -37,7 +37,7 @@ SYMBOL TABLE SSA (const byte*) SCREEN = (byte*)(number) $400 (void()) main() (label) main::@return -(struct Point) point1 loadstore = { x: (byte) 2, initials: (string) "jg" } +(struct Point) point1 loadstore = { x: (byte) 2, initials: (byte*) "jg" } Adding number conversion cast (unumber) 0 in *((const byte*) SCREEN + (number) 0) ← *((byte*)&(struct Point) point1+(const byte) OFFSET_STRUCT_POINT_X) Adding number conversion cast (unumber) 0 in *((const byte*) SCREEN + (number) 1) ← *((byte*)&(struct Point) point1+(const byte) OFFSET_STRUCT_POINT_INITIALS + (number) 0) @@ -107,7 +107,7 @@ main::@return: scope:[main] from main VARIABLE REGISTER WEIGHTS (byte) Point::x (void()) main() -(struct Point) point1 loadstore = { x: (byte) 2, initials: (string) "jg" } +(struct Point) point1 loadstore = { x: (byte) 2, initials: (byte*) "jg" } Initial phi equivalence classes Added variable point1 to live range equivalence class [ point1 ] @@ -252,7 +252,7 @@ FINAL SYMBOL TABLE (const byte*) SCREEN = (byte*) 1024 (void()) main() (label) main::@return -(struct Point) point1 loadstore mem[3] = { x: (byte) 2, initials: (string) "jg" } +(struct Point) point1 loadstore mem[3] = { x: (byte) 2, initials: (byte*) "jg" } mem[3] [ point1 ] diff --git a/src/test/ref/struct-36.sym b/src/test/ref/struct-36.sym index 4b57a0bbc..fe9d9e775 100644 --- a/src/test/ref/struct-36.sym +++ b/src/test/ref/struct-36.sym @@ -7,6 +7,6 @@ (const byte*) SCREEN = (byte*) 1024 (void()) main() (label) main::@return -(struct Point) point1 loadstore mem[3] = { x: (byte) 2, initials: (string) "jg" } +(struct Point) point1 loadstore mem[3] = { x: (byte) 2, initials: (byte*) "jg" } mem[3] [ point1 ] diff --git a/src/test/ref/struct-ptr-22.log b/src/test/ref/struct-ptr-22.log index 1b7deb009..1fc2901c0 100644 --- a/src/test/ref/struct-ptr-22.log +++ b/src/test/ref/struct-ptr-22.log @@ -376,8 +376,8 @@ SYMBOL TABLE SSA (signed word) main::return#1 (signed word) main::return#2 (signed word) main::return#3 -(const byte*) main::str[(byte) 7] = (string) "$0000=" -(const byte*) main::str1[(byte) 7] = (string) "$4004=" +(const byte*) main::str[(byte) 7] = (byte*) "$0000=" +(const byte*) main::str1[(byte) 7] = (byte*) "$4004=" (void*()) memset((void*) memset::str , (byte) memset::c , (word) memset::num) (bool~) memset::$0 (bool~) memset::$1 @@ -488,7 +488,7 @@ SYMBOL TABLE SSA (void()) print_cls() (label) print_cls::@1 (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#0 (byte*) print_line_cursor#1 @@ -1860,8 +1860,8 @@ FINAL SYMBOL TABLE (label) main::@6 (label) main::@return (signed word) main::return -(const byte*) main::str[(byte) 7] = (string) "$0000=" -(const byte*) main::str1[(byte) 7] = (string) "$4004=" +(const byte*) main::str[(byte) 7] = (byte*) "$0000=" +(const byte*) main::str1[(byte) 7] = (byte*) "$4004=" (void*()) memset((void*) memset::str , (byte) memset::c , (word) memset::num) (label) memset::@1 (label) memset::@2 @@ -1902,7 +1902,7 @@ FINAL SYMBOL TABLE (byte*) print_char_cursor#47 print_char_cursor zp[2]:6 4.0 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:4 4.111111111111112 (byte*) print_line_cursor#10 print_line_cursor zp[2]:4 24.0 diff --git a/src/test/ref/struct-ptr-22.sym b/src/test/ref/struct-ptr-22.sym index 70efe2423..5bc4615af 100644 --- a/src/test/ref/struct-ptr-22.sym +++ b/src/test/ref/struct-ptr-22.sym @@ -18,8 +18,8 @@ (label) main::@6 (label) main::@return (signed word) main::return -(const byte*) main::str[(byte) 7] = (string) "$0000=" -(const byte*) main::str1[(byte) 7] = (string) "$4004=" +(const byte*) main::str[(byte) 7] = (byte*) "$0000=" +(const byte*) main::str1[(byte) 7] = (byte*) "$4004=" (void*()) memset((void*) memset::str , (byte) memset::c , (word) memset::num) (label) memset::@1 (label) memset::@2 @@ -60,7 +60,7 @@ (byte*) print_char_cursor#47 print_char_cursor zp[2]:6 4.0 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:4 4.111111111111112 (byte*) print_line_cursor#10 print_line_cursor zp[2]:4 24.0 diff --git a/src/test/ref/struct-ptr-23.log b/src/test/ref/struct-ptr-23.log index e706af320..606b40df3 100644 --- a/src/test/ref/struct-ptr-23.log +++ b/src/test/ref/struct-ptr-23.log @@ -119,7 +119,7 @@ SYMBOL TABLE SSA (struct Person*) main::person#0 (struct Person*) main::person#1 (struct Person*) main::person#2 -(const struct Person*) persons[] = { { id: (byte) 1, initials: (string) "jgr" }, { id: (byte) 8, initials: (string) "hbg" } } +(const struct Person*) persons[] = { { id: (byte) 1, initials: (byte*) "jgr" }, { id: (byte) 8, initials: (byte*) "hbg" } } (void()) print_person((struct Person*) print_person::person) (byte~) print_person::$0 (byte*~) print_person::$1 @@ -716,7 +716,7 @@ FINAL SYMBOL TABLE (label) main::@return (struct Person*) main::person (const struct Person*) main::person#1 person = (const struct Person*) persons+(const byte) SIZEOF_STRUCT_PERSON -(const struct Person*) persons[] = { { id: (byte) 1, initials: (string) "jgr" }, { id: (byte) 8, initials: (string) "hbg" } } +(const struct Person*) persons[] = { { id: (byte) 1, initials: (byte*) "jgr" }, { id: (byte) 8, initials: (byte*) "hbg" } } (void()) print_person((struct Person*) print_person::person) (byte~) print_person::$0 reg byte a 4.0 (byte*~) print_person::$3 zp[2]:4 4.0 diff --git a/src/test/ref/struct-ptr-23.sym b/src/test/ref/struct-ptr-23.sym index c25f4dc81..408b2c285 100644 --- a/src/test/ref/struct-ptr-23.sym +++ b/src/test/ref/struct-ptr-23.sym @@ -19,7 +19,7 @@ (label) main::@return (struct Person*) main::person (const struct Person*) main::person#1 person = (const struct Person*) persons+(const byte) SIZEOF_STRUCT_PERSON -(const struct Person*) persons[] = { { id: (byte) 1, initials: (string) "jgr" }, { id: (byte) 8, initials: (string) "hbg" } } +(const struct Person*) persons[] = { { id: (byte) 1, initials: (byte*) "jgr" }, { id: (byte) 8, initials: (byte*) "hbg" } } (void()) print_person((struct Person*) print_person::person) (byte~) print_person::$0 reg byte a 4.0 (byte*~) print_person::$3 zp[2]:4 4.0 diff --git a/src/test/ref/struct-ptr-26.log b/src/test/ref/struct-ptr-26.log index 230f8d816..22f631beb 100644 --- a/src/test/ref/struct-ptr-26.log +++ b/src/test/ref/struct-ptr-26.log @@ -233,7 +233,7 @@ SYMBOL TABLE SSA (byte*) print_char_cursor#7 (byte*) print_char_cursor#8 (byte*) print_char_cursor#9 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#0 (byte*) print_screen @@ -902,7 +902,7 @@ FINAL SYMBOL TABLE (byte*) print_char_cursor#18 print_char_cursor zp[2]:2 4.0 (byte*) print_char_cursor#19 print_char_cursor zp[2]:2 0.6666666666666666 (byte*) print_char_cursor#24 print_char_cursor zp[2]:2 1.3333333333333333 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_screen (void()) print_word((word) print_word::w) diff --git a/src/test/ref/struct-ptr-26.sym b/src/test/ref/struct-ptr-26.sym index 0efefb02d..f942344ec 100644 --- a/src/test/ref/struct-ptr-26.sym +++ b/src/test/ref/struct-ptr-26.sym @@ -34,7 +34,7 @@ (byte*) print_char_cursor#18 print_char_cursor zp[2]:2 4.0 (byte*) print_char_cursor#19 print_char_cursor zp[2]:2 0.6666666666666666 (byte*) print_char_cursor#24 print_char_cursor zp[2]:2 1.3333333333333333 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_screen (void()) print_word((word) print_word::w) diff --git a/src/test/ref/struct-ptr-28.log b/src/test/ref/struct-ptr-28.log index ce5e1af75..c38e40bf4 100644 --- a/src/test/ref/struct-ptr-28.log +++ b/src/test/ref/struct-ptr-28.log @@ -97,14 +97,14 @@ print_person::@return: scope:[print_person] from print_person::@3 @end: scope:[] from @3 SYMBOL TABLE SSA -(const struct Person) $0 = { id: (byte) 4, name: (string) "jesper" } -(const struct Person) $1 = { id: (byte) 7, name: (string) "henriette" } +(const struct Person) $0 = { id: (byte) 4, name: (byte*) "jesper" } +(const struct Person) $1 = { id: (byte) 7, name: (byte*) "henriette" } (label) @1 (label) @2 (label) @3 (label) @begin (label) @end -(const byte*) DIGIT[] = (string) "0123456789" +(const byte*) DIGIT[] = (byte*) "0123456789" (const byte) OFFSET_STRUCT_PERSON_ID = (byte) 0 (const byte) OFFSET_STRUCT_PERSON_NAME = (byte) 1 (byte) Person::id @@ -760,12 +760,12 @@ Removing instruction __b1: Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE -(const struct Person) $0 = { id: (byte) 4, name: (string) "jesper" } -(const struct Person) $1 = { id: (byte) 7, name: (string) "henriette" } +(const struct Person) $0 = { id: (byte) 4, name: (byte*) "jesper" } +(const struct Person) $1 = { id: (byte) 7, name: (byte*) "henriette" } (label) @1 (label) @begin (label) @end -(const byte*) DIGIT[] = (string) "0123456789" +(const byte*) DIGIT[] = (byte*) "0123456789" (const byte) OFFSET_STRUCT_PERSON_NAME = (byte) 1 (byte) Person::id (const byte*) Person::name[(number) $10] = { fill( $10, 0) } diff --git a/src/test/ref/struct-ptr-28.sym b/src/test/ref/struct-ptr-28.sym index bd1cee595..b0c444643 100644 --- a/src/test/ref/struct-ptr-28.sym +++ b/src/test/ref/struct-ptr-28.sym @@ -1,9 +1,9 @@ -(const struct Person) $0 = { id: (byte) 4, name: (string) "jesper" } -(const struct Person) $1 = { id: (byte) 7, name: (string) "henriette" } +(const struct Person) $0 = { id: (byte) 4, name: (byte*) "jesper" } +(const struct Person) $1 = { id: (byte) 7, name: (byte*) "henriette" } (label) @1 (label) @begin (label) @end -(const byte*) DIGIT[] = (string) "0123456789" +(const byte*) DIGIT[] = (byte*) "0123456789" (const byte) OFFSET_STRUCT_PERSON_NAME = (byte) 1 (byte) Person::id (const byte*) Person::name[(number) $10] = { fill( $10, 0) } diff --git a/src/test/ref/struct-ptr-31.log b/src/test/ref/struct-ptr-31.log index a49d4269d..910240e63 100644 --- a/src/test/ref/struct-ptr-31.log +++ b/src/test/ref/struct-ptr-31.log @@ -94,7 +94,7 @@ SYMBOL TABLE SSA (label) @3 (label) @begin (label) @end -(const byte*) DIGIT[] = (string) "0123456789" +(const byte*) DIGIT[] = (byte*) "0123456789" (const byte) OFFSET_STRUCT_PERSON_ID = (byte) 0 (const byte) OFFSET_STRUCT_PERSON_NAME = (byte) 1 (byte) Person::id @@ -127,7 +127,7 @@ SYMBOL TABLE SSA (label) main::@1 (label) main::@2 (label) main::@return -(const struct Person*) persons[] = { { id: (byte) 4, name: (string) "jesper" }, { id: (byte) 7, name: (string) "henriette" } } +(const struct Person*) persons[] = { { id: (byte) 4, name: (byte*) "jesper" }, { id: (byte) 7, name: (byte*) "henriette" } } (void()) print_person((struct Person*) print_person::person) (byte*~) print_person::$0 (byte*~) print_person::$1 @@ -716,7 +716,7 @@ FINAL SYMBOL TABLE (label) @1 (label) @begin (label) @end -(const byte*) DIGIT[] = (string) "0123456789" +(const byte*) DIGIT[] = (byte*) "0123456789" (const byte) OFFSET_STRUCT_PERSON_NAME = (byte) 1 (byte) Person::id (const byte*) Person::name[(number) $10] = { fill( $10, 0) } @@ -732,7 +732,7 @@ FINAL SYMBOL TABLE (void()) main() (label) main::@1 (label) main::@return -(const struct Person*) persons[] = { { id: (byte) 4, name: (string) "jesper" }, { id: (byte) 7, name: (string) "henriette" } } +(const struct Person*) persons[] = { { id: (byte) 4, name: (byte*) "jesper" }, { id: (byte) 7, name: (byte*) "henriette" } } (void()) print_person((struct Person*) print_person::person) (byte*~) print_person::$1 zp[2]:4 22.0 (byte*~) print_person::$2 zp[2]:6 22.0 diff --git a/src/test/ref/struct-ptr-31.sym b/src/test/ref/struct-ptr-31.sym index 57202c8e7..c2e92bea7 100644 --- a/src/test/ref/struct-ptr-31.sym +++ b/src/test/ref/struct-ptr-31.sym @@ -1,7 +1,7 @@ (label) @1 (label) @begin (label) @end -(const byte*) DIGIT[] = (string) "0123456789" +(const byte*) DIGIT[] = (byte*) "0123456789" (const byte) OFFSET_STRUCT_PERSON_NAME = (byte) 1 (byte) Person::id (const byte*) Person::name[(number) $10] = { fill( $10, 0) } @@ -17,7 +17,7 @@ (void()) main() (label) main::@1 (label) main::@return -(const struct Person*) persons[] = { { id: (byte) 4, name: (string) "jesper" }, { id: (byte) 7, name: (string) "henriette" } } +(const struct Person*) persons[] = { { id: (byte) 4, name: (byte*) "jesper" }, { id: (byte) 7, name: (byte*) "henriette" } } (void()) print_person((struct Person*) print_person::person) (byte*~) print_person::$1 zp[2]:4 22.0 (byte*~) print_person::$2 zp[2]:6 22.0 diff --git a/src/test/ref/struct-ptr-33.log b/src/test/ref/struct-ptr-33.log index b5e21888d..33158e9df 100644 --- a/src/test/ref/struct-ptr-33.log +++ b/src/test/ref/struct-ptr-33.log @@ -47,7 +47,7 @@ SYMBOL TABLE SSA (struct Person*) main::person (struct Person*) main::person#0 (struct Person*) main::person#1 -(const struct Person*) persons[(number) 2] = { { id: (byte) 7, name: (string) "jesper", age: (word) $141 }, { id: (byte) 9, name: (string) "henry", age: (word) $7b } } +(const struct Person*) persons[(number) 2] = { { id: (byte) 7, name: (byte*) "jesper", age: (word) $141 }, { id: (byte) 9, name: (byte*) "henry", age: (word) $7b } } Adding number conversion cast (unumber) 2 in *((const byte*) main::SCREEN + (number) 0) ← *((byte*~) main::$0 + (number) 2) Adding number conversion cast (unumber) 0 in *((const byte*) main::SCREEN + (number) 0) ← *((byte*~) main::$0 + (unumber)(number) 2) @@ -287,7 +287,7 @@ FINAL SYMBOL TABLE (const byte*) main::SCREEN = (byte*) 1024 (struct Person*) main::person (const struct Person*) main::person#1 person = (const struct Person*) persons+(const byte) SIZEOF_STRUCT_PERSON -(const struct Person*) persons[(number) 2] = { { id: (byte) 7, name: (string) "jesper", age: (word) $141 }, { id: (byte) 9, name: (string) "henry", age: (word) $7b } } +(const struct Person*) persons[(number) 2] = { { id: (byte) 7, name: (byte*) "jesper", age: (word) $141 }, { id: (byte) 9, name: (byte*) "henry", age: (word) $7b } } diff --git a/src/test/ref/struct-ptr-33.sym b/src/test/ref/struct-ptr-33.sym index 0e8c4d221..a27b797f5 100644 --- a/src/test/ref/struct-ptr-33.sym +++ b/src/test/ref/struct-ptr-33.sym @@ -11,5 +11,5 @@ (const byte*) main::SCREEN = (byte*) 1024 (struct Person*) main::person (const struct Person*) main::person#1 person = (const struct Person*) persons+(const byte) SIZEOF_STRUCT_PERSON -(const struct Person*) persons[(number) 2] = { { id: (byte) 7, name: (string) "jesper", age: (word) $141 }, { id: (byte) 9, name: (string) "henry", age: (word) $7b } } +(const struct Person*) persons[(number) 2] = { { id: (byte) 7, name: (byte*) "jesper", age: (word) $141 }, { id: (byte) 9, name: (byte*) "henry", age: (word) $7b } } diff --git a/src/test/ref/struct-ptr-34.log b/src/test/ref/struct-ptr-34.log index fde4ac702..2ce155d89 100644 --- a/src/test/ref/struct-ptr-34.log +++ b/src/test/ref/struct-ptr-34.log @@ -13,11 +13,11 @@ Created struct value member variable (byte) print_person::person_id Created struct value member variable (byte*) print_person::person_name Converted struct value to member variables (struct Person) print_person::person Converted procedure struct value parameter to member unwinding (void()) print_person((byte) print_person::person_id , (byte*) print_person::person_name) -Unwinding value copy (struct Person) main::jesper ← { id: (byte) 4, name: (string) "jesper" } +Unwinding value copy (struct Person) main::jesper ← { id: (byte) 4, name: (byte*) "jesper" } Adding value simple copy (byte) main::jesper_id ← (byte) 4 Adding value bulk copy *((const byte*) main::jesper_name) ← memcpy(*(&(const byte*) $0), byte, (number) $10) Converted procedure struct value parameter to member unwinding in call (void~) main::$0 ← call print_person (byte) main::jesper_id (const byte*) main::jesper_name -Unwinding value copy (struct Person) main::henriette ← { id: (byte) 7, name: (string) "henriette" } +Unwinding value copy (struct Person) main::henriette ← { id: (byte) 7, name: (byte*) "henriette" } Adding value simple copy (byte) main::henriette_id ← (byte) 7 Adding value bulk copy *((const byte*) main::henriette_name) ← memcpy(*(&(const byte*) $1), byte, (number) $10) Converted procedure struct value parameter to member unwinding in call (void~) main::$1 ← call print_person (byte) main::henriette_id (const byte*) main::henriette_name @@ -111,14 +111,14 @@ print_person::@return: scope:[print_person] from print_person::@3 @end: scope:[] from @3 SYMBOL TABLE SSA -(const byte*) $0[(number) $10] = (string) "jesper" -(const byte*) $1[(number) $10] = (string) "henriette" +(const byte*) $0[(number) $10] = (byte*) "jesper" +(const byte*) $1[(number) $10] = (byte*) "henriette" (label) @1 (label) @2 (label) @3 (label) @begin (label) @end -(const byte*) DIGIT[] = (string) "0123456789" +(const byte*) DIGIT[] = (byte*) "0123456789" (byte) Person::id (const byte*) Person::name[(number) $10] = { fill( $10, 0) } (const byte*) SCREEN = (byte*)(number) $400 @@ -720,12 +720,12 @@ Removing instruction __b1: Succesful ASM optimization Pass5UnusedLabelElimination FINAL SYMBOL TABLE -(const byte*) $0[(number) $10] = (string) "jesper" -(const byte*) $1[(number) $10] = (string) "henriette" +(const byte*) $0[(number) $10] = (byte*) "jesper" +(const byte*) $1[(number) $10] = (byte*) "henriette" (label) @1 (label) @begin (label) @end -(const byte*) DIGIT[] = (string) "0123456789" +(const byte*) DIGIT[] = (byte*) "0123456789" (byte) Person::id (const byte*) Person::name[(number) $10] = { fill( $10, 0) } (const byte*) SCREEN = (byte*) 1024 diff --git a/src/test/ref/struct-ptr-34.sym b/src/test/ref/struct-ptr-34.sym index c38b3b6f5..53e2396f2 100644 --- a/src/test/ref/struct-ptr-34.sym +++ b/src/test/ref/struct-ptr-34.sym @@ -1,9 +1,9 @@ -(const byte*) $0[(number) $10] = (string) "jesper" -(const byte*) $1[(number) $10] = (string) "henriette" +(const byte*) $0[(number) $10] = (byte*) "jesper" +(const byte*) $1[(number) $10] = (byte*) "henriette" (label) @1 (label) @begin (label) @end -(const byte*) DIGIT[] = (string) "0123456789" +(const byte*) DIGIT[] = (byte*) "0123456789" (byte) Person::id (const byte*) Person::name[(number) $10] = { fill( $10, 0) } (const byte*) SCREEN = (byte*) 1024 diff --git a/src/test/ref/test-comparisons-sword.log b/src/test/ref/test-comparisons-sword.log index 4a052d288..a8e3b45da 100644 --- a/src/test/ref/test-comparisons-sword.log +++ b/src/test/ref/test-comparisons-sword.log @@ -737,12 +737,12 @@ SYMBOL TABLE SSA (bool~) compare::$20 (bool~) compare::$21 (bool~) compare::$22 -(const byte*) compare::$23[(byte) 3] = (string) "!=" -(const byte*) compare::$24[(byte) 3] = (string) "==" -(const byte*) compare::$25[(byte) 3] = (string) ">=" -(const byte*) compare::$26[(byte) 3] = (string) "> " -(const byte*) compare::$27[(byte) 3] = (string) "<=" -(const byte*) compare::$28[(byte) 3] = (string) "< " +(const byte*) compare::$23[(byte) 3] = (byte*) "!=" +(const byte*) compare::$24[(byte) 3] = (byte*) "==" +(const byte*) compare::$25[(byte) 3] = (byte*) ">=" +(const byte*) compare::$26[(byte) 3] = (byte*) "> " +(const byte*) compare::$27[(byte) 3] = (byte*) "<=" +(const byte*) compare::$28[(byte) 3] = (byte*) "< " (bool~) compare::$3 (bool~) compare::$4 (bool~) compare::$5 @@ -1128,7 +1128,7 @@ SYMBOL TABLE SSA (void()) print_cls() (label) print_cls::@1 (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#0 (byte*) print_line_cursor#1 @@ -4276,12 +4276,12 @@ FINAL SYMBOL TABLE (byte) compare::op (byte) compare::op#0 reg byte x 168.8333333333334 (byte*) compare::ops -(const byte*) compare::ops#1 ops_1 = (string) "!=" -(const byte*) compare::ops#2 ops_2 = (string) "==" -(const byte*) compare::ops#3 ops_3 = (string) ">=" -(const byte*) compare::ops#4 ops_4 = (string) "> " -(const byte*) compare::ops#5 ops_5 = (string) "<=" -(const byte*) compare::ops#6 ops_6 = (string) "< " +(const byte*) compare::ops#1 ops_1 = (byte*) "!=" +(const byte*) compare::ops#2 ops_2 = (byte*) "==" +(const byte*) compare::ops#3 ops_3 = (byte*) ">=" +(const byte*) compare::ops#4 ops_4 = (byte*) "> " +(const byte*) compare::ops#5 ops_5 = (byte*) "<=" +(const byte*) compare::ops#6 ops_6 = (byte*) "< " (byte*) compare::ops#7 ops zp[2]:5 0.6666666666666666 (byte) compare::r (byte) compare::r#10 r zp[1]:7 1.9999999999999996 @@ -4372,7 +4372,7 @@ FINAL SYMBOL TABLE (byte*) print_char_cursor#81 print_char_cursor zp[2]:8 7.333333333333333 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:13 6401.0 (byte*) print_line_cursor#19 print_line_cursor zp[2]:13 233.8888888888889 diff --git a/src/test/ref/test-comparisons-sword.sym b/src/test/ref/test-comparisons-sword.sym index 5a8a8ac7a..32ecc72f0 100644 --- a/src/test/ref/test-comparisons-sword.sym +++ b/src/test/ref/test-comparisons-sword.sym @@ -45,12 +45,12 @@ (byte) compare::op (byte) compare::op#0 reg byte x 168.8333333333334 (byte*) compare::ops -(const byte*) compare::ops#1 ops_1 = (string) "!=" -(const byte*) compare::ops#2 ops_2 = (string) "==" -(const byte*) compare::ops#3 ops_3 = (string) ">=" -(const byte*) compare::ops#4 ops_4 = (string) "> " -(const byte*) compare::ops#5 ops_5 = (string) "<=" -(const byte*) compare::ops#6 ops_6 = (string) "< " +(const byte*) compare::ops#1 ops_1 = (byte*) "!=" +(const byte*) compare::ops#2 ops_2 = (byte*) "==" +(const byte*) compare::ops#3 ops_3 = (byte*) ">=" +(const byte*) compare::ops#4 ops_4 = (byte*) "> " +(const byte*) compare::ops#5 ops_5 = (byte*) "<=" +(const byte*) compare::ops#6 ops_6 = (byte*) "< " (byte*) compare::ops#7 ops zp[2]:5 0.6666666666666666 (byte) compare::r (byte) compare::r#10 r zp[1]:7 1.9999999999999996 @@ -141,7 +141,7 @@ (byte*) print_char_cursor#81 print_char_cursor zp[2]:8 7.333333333333333 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:13 6401.0 (byte*) print_line_cursor#19 print_line_cursor zp[2]:13 233.8888888888889 diff --git a/src/test/ref/test-comparisons-word.log b/src/test/ref/test-comparisons-word.log index c2dff899c..67b9b8e72 100644 --- a/src/test/ref/test-comparisons-word.log +++ b/src/test/ref/test-comparisons-word.log @@ -688,12 +688,12 @@ SYMBOL TABLE SSA (bool~) compare::$21 (bool~) compare::$22 (bool~) compare::$23 -(const byte*) compare::$24[(byte) 3] = (string) "!=" -(const byte*) compare::$25[(byte) 3] = (string) "==" -(const byte*) compare::$26[(byte) 3] = (string) ">=" -(const byte*) compare::$27[(byte) 3] = (string) "> " -(const byte*) compare::$28[(byte) 3] = (string) "<=" -(const byte*) compare::$29[(byte) 3] = (string) "< " +(const byte*) compare::$24[(byte) 3] = (byte*) "!=" +(const byte*) compare::$25[(byte) 3] = (byte*) "==" +(const byte*) compare::$26[(byte) 3] = (byte*) ">=" +(const byte*) compare::$27[(byte) 3] = (byte*) "> " +(const byte*) compare::$28[(byte) 3] = (byte*) "<=" +(const byte*) compare::$29[(byte) 3] = (byte*) "< " (bool~) compare::$3 (bool~) compare::$4 (bool~) compare::$5 @@ -1069,7 +1069,7 @@ SYMBOL TABLE SSA (void()) print_cls() (label) print_cls::@1 (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#0 (byte*) print_line_cursor#1 @@ -4020,12 +4020,12 @@ FINAL SYMBOL TABLE (byte) compare::op (byte) compare::op#0 reg byte x 168.8333333333334 (byte*) compare::ops -(const byte*) compare::ops#1 ops_1 = (string) "!=" -(const byte*) compare::ops#2 ops_2 = (string) "==" -(const byte*) compare::ops#3 ops_3 = (string) ">=" -(const byte*) compare::ops#4 ops_4 = (string) "> " -(const byte*) compare::ops#5 ops_5 = (string) "<=" -(const byte*) compare::ops#6 ops_6 = (string) "< " +(const byte*) compare::ops#1 ops_1 = (byte*) "!=" +(const byte*) compare::ops#2 ops_2 = (byte*) "==" +(const byte*) compare::ops#3 ops_3 = (byte*) ">=" +(const byte*) compare::ops#4 ops_4 = (byte*) "> " +(const byte*) compare::ops#5 ops_5 = (byte*) "<=" +(const byte*) compare::ops#6 ops_6 = (byte*) "< " (byte*) compare::ops#7 ops zp[2]:5 0.6666666666666666 (byte) compare::r (byte) compare::r#10 r zp[1]:7 1.9999999999999996 @@ -4117,7 +4117,7 @@ FINAL SYMBOL TABLE (byte*) print_char_cursor#71 print_char_cursor zp[2]:10 7.333333333333333 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:13 6401.0 (byte*) print_line_cursor#19 print_line_cursor zp[2]:13 233.8888888888889 diff --git a/src/test/ref/test-comparisons-word.sym b/src/test/ref/test-comparisons-word.sym index ce9f034df..c7d75a34f 100644 --- a/src/test/ref/test-comparisons-word.sym +++ b/src/test/ref/test-comparisons-word.sym @@ -40,12 +40,12 @@ (byte) compare::op (byte) compare::op#0 reg byte x 168.8333333333334 (byte*) compare::ops -(const byte*) compare::ops#1 ops_1 = (string) "!=" -(const byte*) compare::ops#2 ops_2 = (string) "==" -(const byte*) compare::ops#3 ops_3 = (string) ">=" -(const byte*) compare::ops#4 ops_4 = (string) "> " -(const byte*) compare::ops#5 ops_5 = (string) "<=" -(const byte*) compare::ops#6 ops_6 = (string) "< " +(const byte*) compare::ops#1 ops_1 = (byte*) "!=" +(const byte*) compare::ops#2 ops_2 = (byte*) "==" +(const byte*) compare::ops#3 ops_3 = (byte*) ">=" +(const byte*) compare::ops#4 ops_4 = (byte*) "> " +(const byte*) compare::ops#5 ops_5 = (byte*) "<=" +(const byte*) compare::ops#6 ops_6 = (byte*) "< " (byte*) compare::ops#7 ops zp[2]:5 0.6666666666666666 (byte) compare::r (byte) compare::r#10 r zp[1]:7 1.9999999999999996 @@ -137,7 +137,7 @@ (byte*) print_char_cursor#71 print_char_cursor zp[2]:10 7.333333333333333 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:13 6401.0 (byte*) print_line_cursor#19 print_line_cursor zp[2]:13 233.8888888888889 diff --git a/src/test/ref/test-comparisons.log b/src/test/ref/test-comparisons.log index abc2653fc..dd925caea 100644 --- a/src/test/ref/test-comparisons.log +++ b/src/test/ref/test-comparisons.log @@ -1356,26 +1356,26 @@ SYMBOL TABLE SSA (byte) main::i#7 (byte) main::i#8 (byte) main::i#9 -(const byte*) main::op[(byte) 3] = (string) "< " -(const byte*) main::op1[(byte) 3] = (string) "< " -(const byte*) main::op10[(byte) 3] = (string) "<=" -(const byte*) main::op11[(byte) 3] = (string) "<=" -(const byte*) main::op12[(byte) 3] = (string) ">=" -(const byte*) main::op13[(byte) 3] = (string) ">=" -(const byte*) main::op14[(byte) 3] = (string) ">=" -(const byte*) main::op15[(byte) 3] = (string) ">=" -(const byte*) main::op16[(byte) 3] = (string) "==" -(const byte*) main::op17[(byte) 3] = (string) "==" -(const byte*) main::op18[(byte) 3] = (string) "==" -(const byte*) main::op19[(byte) 3] = (string) "==" -(const byte*) main::op2[(byte) 3] = (string) "< " -(const byte*) main::op3[(byte) 3] = (string) "< " -(const byte*) main::op4[(byte) 3] = (string) "> " -(const byte*) main::op5[(byte) 3] = (string) "> " -(const byte*) main::op6[(byte) 3] = (string) "> " -(const byte*) main::op7[(byte) 3] = (string) "> " -(const byte*) main::op8[(byte) 3] = (string) "<=" -(const byte*) main::op9[(byte) 3] = (string) "<=" +(const byte*) main::op[(byte) 3] = (byte*) "< " +(const byte*) main::op1[(byte) 3] = (byte*) "< " +(const byte*) main::op10[(byte) 3] = (byte*) "<=" +(const byte*) main::op11[(byte) 3] = (byte*) "<=" +(const byte*) main::op12[(byte) 3] = (byte*) ">=" +(const byte*) main::op13[(byte) 3] = (byte*) ">=" +(const byte*) main::op14[(byte) 3] = (byte*) ">=" +(const byte*) main::op15[(byte) 3] = (byte*) ">=" +(const byte*) main::op16[(byte) 3] = (byte*) "==" +(const byte*) main::op17[(byte) 3] = (byte*) "==" +(const byte*) main::op18[(byte) 3] = (byte*) "==" +(const byte*) main::op19[(byte) 3] = (byte*) "==" +(const byte*) main::op2[(byte) 3] = (byte*) "< " +(const byte*) main::op3[(byte) 3] = (byte*) "< " +(const byte*) main::op4[(byte) 3] = (byte*) "> " +(const byte*) main::op5[(byte) 3] = (byte*) "> " +(const byte*) main::op6[(byte) 3] = (byte*) "> " +(const byte*) main::op7[(byte) 3] = (byte*) "> " +(const byte*) main::op8[(byte) 3] = (byte*) "<=" +(const byte*) main::op9[(byte) 3] = (byte*) "<=" (byte) main::r (byte) main::r#0 (byte) main::r#1 @@ -1645,7 +1645,7 @@ SYMBOL TABLE SSA (void()) print_cls() (label) print_cls::@1 (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#0 (byte*) print_line_cursor#1 @@ -6770,11 +6770,11 @@ FINAL SYMBOL TABLE (byte) main::i (byte) main::i#1 i zp[1]:3 11.0 (byte) main::i#10 i zp[1]:3 0.8684210526315792 -(const byte*) main::op[(byte) 3] = (string) "< " -(const byte*) main::op12[(byte) 3] = (string) ">=" -(const byte*) main::op16[(byte) 3] = (string) "==" -(const byte*) main::op4[(byte) 3] = (string) "> " -(const byte*) main::op8[(byte) 3] = (string) "<=" +(const byte*) main::op[(byte) 3] = (byte*) "< " +(const byte*) main::op12[(byte) 3] = (byte*) ">=" +(const byte*) main::op16[(byte) 3] = (byte*) "==" +(const byte*) main::op4[(byte) 3] = (byte*) "> " +(const byte*) main::op8[(byte) 3] = (byte*) "<=" (byte) main::r (byte) main::r#41 reg byte x 3.6666666666666665 (byte) main::r#42 reg byte x 5.5 @@ -6843,7 +6843,7 @@ FINAL SYMBOL TABLE (byte*) print_char_cursor#95 print_char_cursor zp[2]:7 222.0 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:10 3.2265625 (byte*) print_line_cursor#13 print_line_cursor zp[2]:10 204.0 diff --git a/src/test/ref/test-comparisons.sym b/src/test/ref/test-comparisons.sym index 4afbfc37e..7ddcad896 100644 --- a/src/test/ref/test-comparisons.sym +++ b/src/test/ref/test-comparisons.sym @@ -83,11 +83,11 @@ (byte) main::i (byte) main::i#1 i zp[1]:3 11.0 (byte) main::i#10 i zp[1]:3 0.8684210526315792 -(const byte*) main::op[(byte) 3] = (string) "< " -(const byte*) main::op12[(byte) 3] = (string) ">=" -(const byte*) main::op16[(byte) 3] = (string) "==" -(const byte*) main::op4[(byte) 3] = (string) "> " -(const byte*) main::op8[(byte) 3] = (string) "<=" +(const byte*) main::op[(byte) 3] = (byte*) "< " +(const byte*) main::op12[(byte) 3] = (byte*) ">=" +(const byte*) main::op16[(byte) 3] = (byte*) "==" +(const byte*) main::op4[(byte) 3] = (byte*) "> " +(const byte*) main::op8[(byte) 3] = (byte*) "<=" (byte) main::r (byte) main::r#41 reg byte x 3.6666666666666665 (byte) main::r#42 reg byte x 5.5 @@ -156,7 +156,7 @@ (byte*) print_char_cursor#95 print_char_cursor zp[2]:7 222.0 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:10 3.2265625 (byte*) print_line_cursor#13 print_line_cursor zp[2]:10 204.0 diff --git a/src/test/ref/test-division.log b/src/test/ref/test-division.log index 3e79dfd15..56219abd3 100644 --- a/src/test/ref/test-division.log +++ b/src/test/ref/test-division.log @@ -2128,7 +2128,7 @@ SYMBOL TABLE SSA (void()) print_cls() (label) print_cls::@1 (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#0 (byte*) print_line_cursor#1 @@ -2567,9 +2567,9 @@ SYMBOL TABLE SSA (signed word) test_16s::res#2 (signed word) test_16s::res#3 (signed word) test_16s::res#4 -(const byte*) test_16s::str[(byte) 4] = (string) " / " -(const byte*) test_16s::str1[(byte) 4] = (string) " = " -(const byte*) test_16s::str2[(byte) 2] = (string) " " +(const byte*) test_16s::str[(byte) 4] = (byte*) " / " +(const byte*) test_16s::str1[(byte) 4] = (byte*) " = " +(const byte*) test_16s::str2[(byte) 2] = (byte*) " " (void()) test_16u() (word~) test_16u::$0 (byte~) test_16u::$10 @@ -2615,9 +2615,9 @@ SYMBOL TABLE SSA (word) test_16u::res#2 (word) test_16u::res#3 (word) test_16u::res#4 -(const byte*) test_16u::str[(byte) 4] = (string) " / " -(const byte*) test_16u::str1[(byte) 4] = (string) " = " -(const byte*) test_16u::str2[(byte) 2] = (string) " " +(const byte*) test_16u::str[(byte) 4] = (byte*) " / " +(const byte*) test_16u::str1[(byte) 4] = (byte*) " = " +(const byte*) test_16u::str2[(byte) 2] = (byte*) " " (void()) test_8s() (signed byte~) test_8s::$0 (bool~) test_8s::$9 @@ -2661,9 +2661,9 @@ SYMBOL TABLE SSA (signed byte) test_8s::res#2 (signed byte) test_8s::res#3 (signed byte) test_8s::res#4 -(const byte*) test_8s::str[(byte) 4] = (string) " / " -(const byte*) test_8s::str1[(byte) 4] = (string) " = " -(const byte*) test_8s::str2[(byte) 2] = (string) " " +(const byte*) test_8s::str[(byte) 4] = (byte*) " / " +(const byte*) test_8s::str1[(byte) 4] = (byte*) " = " +(const byte*) test_8s::str2[(byte) 2] = (byte*) " " (void()) test_8u() (byte~) test_8u::$0 (bool~) test_8u::$9 @@ -2707,9 +2707,9 @@ SYMBOL TABLE SSA (byte) test_8u::res#2 (byte) test_8u::res#3 (byte) test_8u::res#4 -(const byte*) test_8u::str[(byte) 4] = (string) " / " -(const byte*) test_8u::str1[(byte) 4] = (string) " = " -(const byte*) test_8u::str2[(byte) 2] = (string) " " +(const byte*) test_8u::str[(byte) 4] = (byte*) " / " +(const byte*) test_8u::str1[(byte) 4] = (byte*) " = " +(const byte*) test_8u::str2[(byte) 2] = (byte*) " " Adding number conversion cast (unumber) 0 in (bool~) memset::$0 ← (word) memset::num#1 > (number) 0 Adding number conversion cast (unumber) 0 in (bool~) print_str::$0 ← (number) 0 != *((byte*) print_str::str#13) @@ -9661,7 +9661,7 @@ FINAL SYMBOL TABLE (byte*) print_char_cursor#84 print_char_cursor zp[2]:5 8.0 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:15 3.833333333333334 (byte*) print_line_cursor#20 print_line_cursor zp[2]:15 204.0 @@ -9729,9 +9729,9 @@ FINAL SYMBOL TABLE (signed byte) rem8s#33 reg byte x 4.0 (byte) rem8u (byte) rem8u#17 reg byte x 0.5 -(const byte*) str[(byte) 4] = (string) " / " -(const byte*) str1[(byte) 4] = (string) " = " -(const byte*) str2[(byte) 2] = (string) " " +(const byte*) str[(byte) 4] = (byte*) " / " +(const byte*) str1[(byte) 4] = (byte*) " = " +(const byte*) str2[(byte) 2] = (byte*) " " (void()) test_16s() (byte~) test_16s::$11 reg byte x 16.5 (label) test_16s::@1 diff --git a/src/test/ref/test-division.sym b/src/test/ref/test-division.sym index 9178edd14..a47931dda 100644 --- a/src/test/ref/test-division.sym +++ b/src/test/ref/test-division.sym @@ -244,7 +244,7 @@ (byte*) print_char_cursor#84 print_char_cursor zp[2]:5 8.0 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:15 3.833333333333334 (byte*) print_line_cursor#20 print_line_cursor zp[2]:15 204.0 @@ -312,9 +312,9 @@ (signed byte) rem8s#33 reg byte x 4.0 (byte) rem8u (byte) rem8u#17 reg byte x 0.5 -(const byte*) str[(byte) 4] = (string) " / " -(const byte*) str1[(byte) 4] = (string) " = " -(const byte*) str2[(byte) 2] = (string) " " +(const byte*) str[(byte) 4] = (byte*) " / " +(const byte*) str1[(byte) 4] = (byte*) " = " +(const byte*) str2[(byte) 2] = (byte*) " " (void()) test_16s() (byte~) test_16s::$11 reg byte x 16.5 (label) test_16s::@1 diff --git a/src/test/ref/test-lowhigh.log b/src/test/ref/test-lowhigh.log index 722b0d51b..6311866ba 100644 --- a/src/test/ref/test-lowhigh.log +++ b/src/test/ref/test-lowhigh.log @@ -675,7 +675,7 @@ SYMBOL TABLE SSA (dword) print_dword::dw#0 (dword) print_dword::dw#1 (dword) print_dword::dw#2 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#0 (byte*) print_line_cursor#1 @@ -2852,7 +2852,7 @@ FINAL SYMBOL TABLE (label) print_dword::@return (dword) print_dword::dw (dword) print_dword::dw#0 dw zp[4]:10 3.75 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:16 54.16666666666666 (byte*) print_line_cursor#15 print_line_cursor_1 zp[2]:6 0.325 diff --git a/src/test/ref/test-lowhigh.sym b/src/test/ref/test-lowhigh.sym index 6356f1cdb..c9365fb16 100644 --- a/src/test/ref/test-lowhigh.sym +++ b/src/test/ref/test-lowhigh.sym @@ -86,7 +86,7 @@ (label) print_dword::@return (dword) print_dword::dw (dword) print_dword::dw#0 dw zp[4]:10 3.75 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:16 54.16666666666666 (byte*) print_line_cursor#15 print_line_cursor_1 zp[2]:6 0.325 diff --git a/src/test/ref/test-multiply-16bit.log b/src/test/ref/test-multiply-16bit.log index e74e597c6..ffa84dde1 100644 --- a/src/test/ref/test-multiply-16bit.log +++ b/src/test/ref/test-multiply-16bit.log @@ -1786,8 +1786,8 @@ SYMBOL TABLE SSA (byte) mul16s_compare::ok#2 (byte) mul16s_compare::ok#3 (byte) mul16s_compare::ok#4 -(const byte*) mul16s_compare::str[(byte) 2] = (string) "." -(const byte*) mul16s_compare::str1[(byte) $24] = (string) "signed word multiply results match!" +(const byte*) mul16s_compare::str[(byte) 2] = (byte*) "." +(const byte*) mul16s_compare::str1[(byte) $24] = (byte*) "signed word multiply results match!" (void()) mul16s_error((signed word) mul16s_error::a , (signed word) mul16s_error::b , (signed dword) mul16s_error::ms , (signed dword) mul16s_error::mn , (signed dword) mul16s_error::mf) (label) mul16s_error::@1 (label) mul16s_error::@10 @@ -1841,11 +1841,11 @@ SYMBOL TABLE SSA (signed dword) mul16s_error::ms#4 (signed dword) mul16s_error::ms#5 (signed dword) mul16s_error::ms#6 -(const byte*) mul16s_error::str[(byte) $1f] = (string) "signed word multiply mismatch " -(const byte*) mul16s_error::str1[(byte) 2] = (string) "*" -(const byte*) mul16s_error::str2[(byte) 7] = (string) " slow:" -(const byte*) mul16s_error::str3[(byte) $b] = (string) " / normal:" -(const byte*) mul16s_error::str4[(byte) 9] = (string) " / fast:" +(const byte*) mul16s_error::str[(byte) $1f] = (byte*) "signed word multiply mismatch " +(const byte*) mul16s_error::str1[(byte) 2] = (byte*) "*" +(const byte*) mul16s_error::str2[(byte) 7] = (byte*) " slow:" +(const byte*) mul16s_error::str3[(byte) $b] = (byte*) " / normal:" +(const byte*) mul16s_error::str4[(byte) 9] = (byte*) " / fast:" (dword()) mul16u((word) mul16u::a , (word) mul16u::b) (bool~) mul16u::$0 (number~) mul16u::$1 @@ -2018,8 +2018,8 @@ SYMBOL TABLE SSA (byte) mul16u_compare::ok#2 (byte) mul16u_compare::ok#3 (byte) mul16u_compare::ok#4 -(const byte*) mul16u_compare::str[(byte) 2] = (string) "." -(const byte*) mul16u_compare::str1[(byte) $1d] = (string) "word multiply results match!" +(const byte*) mul16u_compare::str[(byte) 2] = (byte*) "." +(const byte*) mul16u_compare::str1[(byte) $1d] = (byte*) "word multiply results match!" (void()) mul16u_error((word) mul16u_error::a , (word) mul16u_error::b , (dword) mul16u_error::ms , (dword) mul16u_error::mn , (dword) mul16u_error::mf) (label) mul16u_error::@1 (label) mul16u_error::@10 @@ -2073,11 +2073,11 @@ SYMBOL TABLE SSA (dword) mul16u_error::ms#4 (dword) mul16u_error::ms#5 (dword) mul16u_error::ms#6 -(const byte*) mul16u_error::str[(byte) $13] = (string) "multiply mismatch " -(const byte*) mul16u_error::str1[(byte) 2] = (string) "*" -(const byte*) mul16u_error::str2[(byte) 7] = (string) " slow:" -(const byte*) mul16u_error::str3[(byte) $b] = (string) " / normal:" -(const byte*) mul16u_error::str4[(byte) 9] = (string) " / fast:" +(const byte*) mul16u_error::str[(byte) $13] = (byte*) "multiply mismatch " +(const byte*) mul16u_error::str1[(byte) 2] = (byte*) "*" +(const byte*) mul16u_error::str2[(byte) 7] = (byte*) " slow:" +(const byte*) mul16u_error::str3[(byte) $b] = (byte*) " / normal:" +(const byte*) mul16u_error::str4[(byte) 9] = (byte*) " / fast:" (signed dword()) mulf16s((signed word) mulf16s::a , (signed word) mulf16s::b) (word~) mulf16s::$0 (word~) mulf16s::$1 @@ -2561,7 +2561,7 @@ SYMBOL TABLE SSA (dword) print_dword::dw#3 (dword) print_dword::dw#4 (dword) print_dword::dw#5 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#0 (byte*) print_line_cursor#1 @@ -11029,7 +11029,7 @@ FINAL SYMBOL TABLE (byte) mul16s_compare::ok (byte) mul16s_compare::ok#3 reg byte x 202.0 (byte) mul16s_compare::ok#4 reg byte x 33.666666666666664 -(const byte*) mul16s_compare::str1[(byte) $24] = (string) "signed word multiply results match!" +(const byte*) mul16s_compare::str1[(byte) $24] = (byte*) "signed word multiply results match!" (void()) mul16s_error((signed word) mul16s_error::a , (signed word) mul16s_error::b , (signed dword) mul16s_error::ms , (signed dword) mul16s_error::mn , (signed dword) mul16s_error::mf) (label) mul16s_error::@1 (label) mul16s_error::@10 @@ -11052,7 +11052,7 @@ FINAL SYMBOL TABLE (signed dword) mul16s_error::mn#0 mn zp[4]:6 0.25 (signed dword) mul16s_error::ms (signed dword) mul16s_error::ms#0 ms zp[4]:2 0.3076923076923077 -(const byte*) mul16s_error::str[(byte) $1f] = (string) "signed word multiply mismatch " +(const byte*) mul16s_error::str[(byte) $1f] = (byte*) "signed word multiply mismatch " (dword()) mul16u((word) mul16u::a , (word) mul16u::b) (byte~) mul16u::$1 reg byte a 2002.0 (label) mul16u::@1 @@ -11121,7 +11121,7 @@ FINAL SYMBOL TABLE (byte) mul16u_compare::ok (byte) mul16u_compare::ok#3 reg byte x 202.0 (byte) mul16u_compare::ok#4 reg byte x 33.666666666666664 -(const byte*) mul16u_compare::str1[(byte) $1d] = (string) "word multiply results match!" +(const byte*) mul16u_compare::str1[(byte) $1d] = (byte*) "word multiply results match!" (void()) mul16u_error((word) mul16u_error::a , (word) mul16u_error::b , (dword) mul16u_error::ms , (dword) mul16u_error::mn , (dword) mul16u_error::mf) (label) mul16u_error::@1 (label) mul16u_error::@10 @@ -11144,7 +11144,7 @@ FINAL SYMBOL TABLE (dword) mul16u_error::mn#0 mn zp[4]:6 0.25 (dword) mul16u_error::ms (dword) mul16u_error::ms#0 ms zp[4]:2 0.3076923076923077 -(const byte*) mul16u_error::str[(byte) $13] = (string) "multiply mismatch " +(const byte*) mul16u_error::str[(byte) $13] = (byte*) "multiply mismatch " (signed dword()) mulf16s((signed word) mulf16s::a , (signed word) mulf16s::b) (word~) mulf16s::$13 zp[2]:26 4.0 (word~) mulf16s::$16 zp[2]:24 4.0 @@ -11319,7 +11319,7 @@ FINAL SYMBOL TABLE (dword) print_dword::dw#2 dw zp[4]:2 4.0 (dword) print_dword::dw#3 dw zp[4]:2 4.0 (dword) print_dword::dw#4 dw zp[4]:2 3.9999999999999996 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:19 0.6025641025641025 (byte*) print_line_cursor#22 print_line_cursor zp[2]:19 24.0 @@ -11371,11 +11371,11 @@ FINAL SYMBOL TABLE (word) print_word::w#3 w zp[2]:14 4.0 (word) print_word::w#4 w zp[2]:14 4.0 (word) print_word::w#5 w zp[2]:14 4.666666666666666 -(const byte*) str[(byte) 2] = (string) "." -(const byte*) str1[(byte) 2] = (string) "*" -(const byte*) str2[(byte) 7] = (string) " slow:" -(const byte*) str3[(byte) $b] = (string) " / normal:" -(const byte*) str4[(byte) 9] = (string) " / fast:" +(const byte*) str[(byte) 2] = (byte*) "." +(const byte*) str1[(byte) 2] = (byte*) "*" +(const byte*) str2[(byte) 7] = (byte*) " slow:" +(const byte*) str3[(byte) $b] = (byte*) " / normal:" +(const byte*) str4[(byte) 9] = (byte*) " / fast:" reg byte y [ mul16s_compare::j#10 mul16s_compare::j#1 ] reg byte x [ mul16s_compare::ok#3 mul16s_compare::ok#4 ] diff --git a/src/test/ref/test-multiply-16bit.sym b/src/test/ref/test-multiply-16bit.sym index 986ce1701..9c551a37a 100644 --- a/src/test/ref/test-multiply-16bit.sym +++ b/src/test/ref/test-multiply-16bit.sym @@ -91,7 +91,7 @@ (byte) mul16s_compare::ok (byte) mul16s_compare::ok#3 reg byte x 202.0 (byte) mul16s_compare::ok#4 reg byte x 33.666666666666664 -(const byte*) mul16s_compare::str1[(byte) $24] = (string) "signed word multiply results match!" +(const byte*) mul16s_compare::str1[(byte) $24] = (byte*) "signed word multiply results match!" (void()) mul16s_error((signed word) mul16s_error::a , (signed word) mul16s_error::b , (signed dword) mul16s_error::ms , (signed dword) mul16s_error::mn , (signed dword) mul16s_error::mf) (label) mul16s_error::@1 (label) mul16s_error::@10 @@ -114,7 +114,7 @@ (signed dword) mul16s_error::mn#0 mn zp[4]:6 0.25 (signed dword) mul16s_error::ms (signed dword) mul16s_error::ms#0 ms zp[4]:2 0.3076923076923077 -(const byte*) mul16s_error::str[(byte) $1f] = (string) "signed word multiply mismatch " +(const byte*) mul16s_error::str[(byte) $1f] = (byte*) "signed word multiply mismatch " (dword()) mul16u((word) mul16u::a , (word) mul16u::b) (byte~) mul16u::$1 reg byte a 2002.0 (label) mul16u::@1 @@ -183,7 +183,7 @@ (byte) mul16u_compare::ok (byte) mul16u_compare::ok#3 reg byte x 202.0 (byte) mul16u_compare::ok#4 reg byte x 33.666666666666664 -(const byte*) mul16u_compare::str1[(byte) $1d] = (string) "word multiply results match!" +(const byte*) mul16u_compare::str1[(byte) $1d] = (byte*) "word multiply results match!" (void()) mul16u_error((word) mul16u_error::a , (word) mul16u_error::b , (dword) mul16u_error::ms , (dword) mul16u_error::mn , (dword) mul16u_error::mf) (label) mul16u_error::@1 (label) mul16u_error::@10 @@ -206,7 +206,7 @@ (dword) mul16u_error::mn#0 mn zp[4]:6 0.25 (dword) mul16u_error::ms (dword) mul16u_error::ms#0 ms zp[4]:2 0.3076923076923077 -(const byte*) mul16u_error::str[(byte) $13] = (string) "multiply mismatch " +(const byte*) mul16u_error::str[(byte) $13] = (byte*) "multiply mismatch " (signed dword()) mulf16s((signed word) mulf16s::a , (signed word) mulf16s::b) (word~) mulf16s::$13 zp[2]:26 4.0 (word~) mulf16s::$16 zp[2]:24 4.0 @@ -381,7 +381,7 @@ (dword) print_dword::dw#2 dw zp[4]:2 4.0 (dword) print_dword::dw#3 dw zp[4]:2 4.0 (dword) print_dword::dw#4 dw zp[4]:2 3.9999999999999996 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:19 0.6025641025641025 (byte*) print_line_cursor#22 print_line_cursor zp[2]:19 24.0 @@ -433,11 +433,11 @@ (word) print_word::w#3 w zp[2]:14 4.0 (word) print_word::w#4 w zp[2]:14 4.0 (word) print_word::w#5 w zp[2]:14 4.666666666666666 -(const byte*) str[(byte) 2] = (string) "." -(const byte*) str1[(byte) 2] = (string) "*" -(const byte*) str2[(byte) 7] = (string) " slow:" -(const byte*) str3[(byte) $b] = (string) " / normal:" -(const byte*) str4[(byte) 9] = (string) " / fast:" +(const byte*) str[(byte) 2] = (byte*) "." +(const byte*) str1[(byte) 2] = (byte*) "*" +(const byte*) str2[(byte) 7] = (byte*) " slow:" +(const byte*) str3[(byte) $b] = (byte*) " / normal:" +(const byte*) str4[(byte) 9] = (byte*) " / fast:" reg byte y [ mul16s_compare::j#10 mul16s_compare::j#1 ] reg byte x [ mul16s_compare::ok#3 mul16s_compare::ok#4 ] diff --git a/src/test/ref/test-multiply-8bit.log b/src/test/ref/test-multiply-8bit.log index b89b15b33..e4722ba6a 100644 --- a/src/test/ref/test-multiply-8bit.log +++ b/src/test/ref/test-multiply-8bit.log @@ -1850,7 +1850,7 @@ SYMBOL TABLE SSA (byte) mul8s_compare::ok#2 (byte) mul8s_compare::ok#3 (byte) mul8s_compare::ok#4 -(const byte*) mul8s_compare::str[(byte) $1f] = (string) "signed multiply results match!" +(const byte*) mul8s_compare::str[(byte) $1f] = (byte*) "signed multiply results match!" (void()) mul8s_error((signed byte) mul8s_error::a , (signed byte) mul8s_error::b , (signed word) mul8s_error::ms , (signed word) mul8s_error::mn , (signed word) mul8s_error::mf) (label) mul8s_error::@1 (label) mul8s_error::@10 @@ -1904,11 +1904,11 @@ SYMBOL TABLE SSA (signed word) mul8s_error::ms#4 (signed word) mul8s_error::ms#5 (signed word) mul8s_error::ms#6 -(const byte*) mul8s_error::str[(byte) $1a] = (string) "signed multiply mismatch " -(const byte*) mul8s_error::str1[(byte) 2] = (string) "*" -(const byte*) mul8s_error::str2[(byte) 7] = (string) " slow:" -(const byte*) mul8s_error::str3[(byte) $b] = (string) " / normal:" -(const byte*) mul8s_error::str4[(byte) 9] = (string) " / fast:" +(const byte*) mul8s_error::str[(byte) $1a] = (byte*) "signed multiply mismatch " +(const byte*) mul8s_error::str1[(byte) 2] = (byte*) "*" +(const byte*) mul8s_error::str2[(byte) 7] = (byte*) " slow:" +(const byte*) mul8s_error::str3[(byte) $b] = (byte*) " / normal:" +(const byte*) mul8s_error::str4[(byte) 9] = (byte*) " / fast:" (word()) mul8u((byte) mul8u::a , (byte) mul8u::b) (bool~) mul8u::$0 (number~) mul8u::$1 @@ -2046,7 +2046,7 @@ SYMBOL TABLE SSA (byte) mul8u_compare::ok#2 (byte) mul8u_compare::ok#3 (byte) mul8u_compare::ok#4 -(const byte*) mul8u_compare::str[(byte) $18] = (string) "multiply results match!" +(const byte*) mul8u_compare::str[(byte) $18] = (byte*) "multiply results match!" (void()) mul8u_error((byte) mul8u_error::a , (byte) mul8u_error::b , (word) mul8u_error::ms , (word) mul8u_error::mn , (word) mul8u_error::mf) (label) mul8u_error::@1 (label) mul8u_error::@10 @@ -2100,11 +2100,11 @@ SYMBOL TABLE SSA (word) mul8u_error::ms#4 (word) mul8u_error::ms#5 (word) mul8u_error::ms#6 -(const byte*) mul8u_error::str[(byte) $13] = (string) "multiply mismatch " -(const byte*) mul8u_error::str1[(byte) 2] = (string) "*" -(const byte*) mul8u_error::str2[(byte) 7] = (string) " slow:" -(const byte*) mul8u_error::str3[(byte) $b] = (string) " / normal:" -(const byte*) mul8u_error::str4[(byte) 9] = (string) " / fast:" +(const byte*) mul8u_error::str[(byte) $13] = (byte*) "multiply mismatch " +(const byte*) mul8u_error::str1[(byte) 2] = (byte*) "*" +(const byte*) mul8u_error::str2[(byte) 7] = (byte*) " slow:" +(const byte*) mul8u_error::str3[(byte) $b] = (byte*) " / normal:" +(const byte*) mul8u_error::str4[(byte) 9] = (byte*) " / fast:" (const byte*) mula_sqr1_hi[(number) $200] = { fill( $200, 0) } (const byte*) mula_sqr1_lo[(number) $200] = { fill( $200, 0) } (const byte*) mula_sqr2_hi[(number) $200] = { fill( $200, 0) } @@ -2348,9 +2348,9 @@ SYMBOL TABLE SSA (byte*) mulf_tables_cmp::kc_sqr#6 (byte*) mulf_tables_cmp::kc_sqr#7 (byte*) mulf_tables_cmp::kc_sqr#8 -(const byte*) mulf_tables_cmp::str[(byte) $17] = (string) "multiply tables match!" -(const byte*) mulf_tables_cmp::str1[(byte) $1c] = (string) "multiply table mismatch at " -(const byte*) mulf_tables_cmp::str2[(byte) 4] = (string) " / " +(const byte*) mulf_tables_cmp::str[(byte) $17] = (byte*) "multiply tables match!" +(const byte*) mulf_tables_cmp::str1[(byte) $1c] = (byte*) "multiply table mismatch at " +(const byte*) mulf_tables_cmp::str2[(byte) 4] = (byte*) " / " (signed word()) muls8s((signed byte) muls8s::a , (signed byte) muls8s::b) (bool~) muls8s::$0 (bool~) muls8s::$1 @@ -2673,7 +2673,7 @@ SYMBOL TABLE SSA (void()) print_cls() (label) print_cls::@1 (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#0 (byte*) print_line_cursor#1 @@ -10872,7 +10872,7 @@ FINAL SYMBOL TABLE (byte) mul8s_compare::ok (byte) mul8s_compare::ok#3 reg byte x 202.0 (byte) mul8s_compare::ok#4 reg byte x 33.666666666666664 -(const byte*) mul8s_compare::str[(byte) $1f] = (string) "signed multiply results match!" +(const byte*) mul8s_compare::str[(byte) $1f] = (byte*) "signed multiply results match!" (void()) mul8s_error((signed byte) mul8s_error::a , (signed byte) mul8s_error::b , (signed word) mul8s_error::ms , (signed word) mul8s_error::mn , (signed word) mul8s_error::mf) (label) mul8s_error::@1 (label) mul8s_error::@10 @@ -10895,7 +10895,7 @@ FINAL SYMBOL TABLE (signed word) mul8s_error::mn#0 mn zp[2]:8 0.25 (signed word) mul8s_error::ms (signed word) mul8s_error::ms#0 ms zp[2]:4 0.3076923076923077 -(const byte*) mul8s_error::str[(byte) $1a] = (string) "signed multiply mismatch " +(const byte*) mul8s_error::str[(byte) $1a] = (byte*) "signed multiply mismatch " (word()) mul8u((byte) mul8u::a , (byte) mul8u::b) (byte~) mul8u::$1 reg byte a 2002.0 (label) mul8u::@1 @@ -10955,7 +10955,7 @@ FINAL SYMBOL TABLE (byte) mul8u_compare::ok (byte) mul8u_compare::ok#3 reg byte x 202.0 (byte) mul8u_compare::ok#4 reg byte x 33.666666666666664 -(const byte*) mul8u_compare::str[(byte) $18] = (string) "multiply results match!" +(const byte*) mul8u_compare::str[(byte) $18] = (byte*) "multiply results match!" (void()) mul8u_error((byte) mul8u_error::a , (byte) mul8u_error::b , (word) mul8u_error::ms , (word) mul8u_error::mn , (word) mul8u_error::mf) (label) mul8u_error::@1 (label) mul8u_error::@10 @@ -10978,7 +10978,7 @@ FINAL SYMBOL TABLE (word) mul8u_error::mn#0 mn zp[2]:8 0.25 (word) mul8u_error::ms (word) mul8u_error::ms#0 ms zp[2]:4 0.3076923076923077 -(const byte*) mul8u_error::str[(byte) $13] = (string) "multiply mismatch " +(const byte*) mul8u_error::str[(byte) $13] = (byte*) "multiply mismatch " (const byte*) mula_sqr1_hi[(number) $200] = { fill( $200, 0) } (const byte*) mula_sqr1_lo[(number) $200] = { fill( $200, 0) } (const byte*) mula_sqr2_hi[(number) $200] = { fill( $200, 0) } @@ -11116,9 +11116,9 @@ FINAL SYMBOL TABLE (byte*) mulf_tables_cmp::kc_sqr (byte*) mulf_tables_cmp::kc_sqr#1 kc_sqr zp[2]:2 22.0 (byte*) mulf_tables_cmp::kc_sqr#2 kc_sqr zp[2]:2 4.4 -(const byte*) mulf_tables_cmp::str[(byte) $17] = (string) "multiply tables match!" -(const byte*) mulf_tables_cmp::str1[(byte) $1c] = (string) "multiply table mismatch at " -(const byte*) mulf_tables_cmp::str2[(byte) 4] = (string) " / " +(const byte*) mulf_tables_cmp::str[(byte) $17] = (byte*) "multiply tables match!" +(const byte*) mulf_tables_cmp::str1[(byte) $1c] = (byte*) "multiply table mismatch at " +(const byte*) mulf_tables_cmp::str2[(byte) 4] = (byte*) " / " (signed word()) muls8s((signed byte) muls8s::a , (signed byte) muls8s::b) (label) muls8s::@1 (label) muls8s::@2 @@ -11196,7 +11196,7 @@ FINAL SYMBOL TABLE (byte*) print_char_cursor#86 print_char_cursor zp[2]:6 8.0 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:2 0.6428571428571428 (byte*) print_line_cursor#11 print_line_cursor zp[2]:2 0.09523809523809523 @@ -11250,10 +11250,10 @@ FINAL SYMBOL TABLE (word) print_word::w#4 w zp[2]:4 4.0 (word) print_word::w#5 w zp[2]:4 4.0 (word) print_word::w#6 w zp[2]:4 5.333333333333333 -(const byte*) str1[(byte) 2] = (string) "*" -(const byte*) str2[(byte) 7] = (string) " slow:" -(const byte*) str3[(byte) $b] = (string) " / normal:" -(const byte*) str4[(byte) 9] = (string) " / fast:" +(const byte*) str1[(byte) 2] = (byte*) "*" +(const byte*) str2[(byte) 7] = (byte*) " slow:" +(const byte*) str3[(byte) $b] = (byte*) " / normal:" +(const byte*) str4[(byte) 9] = (byte*) " / fast:" reg byte x [ mul8s_compare::ok#3 mul8s_compare::ok#4 ] reg byte a [ print_char::ch#6 print_char::ch#4 print_char::ch#5 ] diff --git a/src/test/ref/test-multiply-8bit.sym b/src/test/ref/test-multiply-8bit.sym index 93f083ad8..811b5ef7a 100644 --- a/src/test/ref/test-multiply-8bit.sym +++ b/src/test/ref/test-multiply-8bit.sym @@ -83,7 +83,7 @@ (byte) mul8s_compare::ok (byte) mul8s_compare::ok#3 reg byte x 202.0 (byte) mul8s_compare::ok#4 reg byte x 33.666666666666664 -(const byte*) mul8s_compare::str[(byte) $1f] = (string) "signed multiply results match!" +(const byte*) mul8s_compare::str[(byte) $1f] = (byte*) "signed multiply results match!" (void()) mul8s_error((signed byte) mul8s_error::a , (signed byte) mul8s_error::b , (signed word) mul8s_error::ms , (signed word) mul8s_error::mn , (signed word) mul8s_error::mf) (label) mul8s_error::@1 (label) mul8s_error::@10 @@ -106,7 +106,7 @@ (signed word) mul8s_error::mn#0 mn zp[2]:8 0.25 (signed word) mul8s_error::ms (signed word) mul8s_error::ms#0 ms zp[2]:4 0.3076923076923077 -(const byte*) mul8s_error::str[(byte) $1a] = (string) "signed multiply mismatch " +(const byte*) mul8s_error::str[(byte) $1a] = (byte*) "signed multiply mismatch " (word()) mul8u((byte) mul8u::a , (byte) mul8u::b) (byte~) mul8u::$1 reg byte a 2002.0 (label) mul8u::@1 @@ -166,7 +166,7 @@ (byte) mul8u_compare::ok (byte) mul8u_compare::ok#3 reg byte x 202.0 (byte) mul8u_compare::ok#4 reg byte x 33.666666666666664 -(const byte*) mul8u_compare::str[(byte) $18] = (string) "multiply results match!" +(const byte*) mul8u_compare::str[(byte) $18] = (byte*) "multiply results match!" (void()) mul8u_error((byte) mul8u_error::a , (byte) mul8u_error::b , (word) mul8u_error::ms , (word) mul8u_error::mn , (word) mul8u_error::mf) (label) mul8u_error::@1 (label) mul8u_error::@10 @@ -189,7 +189,7 @@ (word) mul8u_error::mn#0 mn zp[2]:8 0.25 (word) mul8u_error::ms (word) mul8u_error::ms#0 ms zp[2]:4 0.3076923076923077 -(const byte*) mul8u_error::str[(byte) $13] = (string) "multiply mismatch " +(const byte*) mul8u_error::str[(byte) $13] = (byte*) "multiply mismatch " (const byte*) mula_sqr1_hi[(number) $200] = { fill( $200, 0) } (const byte*) mula_sqr1_lo[(number) $200] = { fill( $200, 0) } (const byte*) mula_sqr2_hi[(number) $200] = { fill( $200, 0) } @@ -327,9 +327,9 @@ (byte*) mulf_tables_cmp::kc_sqr (byte*) mulf_tables_cmp::kc_sqr#1 kc_sqr zp[2]:2 22.0 (byte*) mulf_tables_cmp::kc_sqr#2 kc_sqr zp[2]:2 4.4 -(const byte*) mulf_tables_cmp::str[(byte) $17] = (string) "multiply tables match!" -(const byte*) mulf_tables_cmp::str1[(byte) $1c] = (string) "multiply table mismatch at " -(const byte*) mulf_tables_cmp::str2[(byte) 4] = (string) " / " +(const byte*) mulf_tables_cmp::str[(byte) $17] = (byte*) "multiply tables match!" +(const byte*) mulf_tables_cmp::str1[(byte) $1c] = (byte*) "multiply table mismatch at " +(const byte*) mulf_tables_cmp::str2[(byte) 4] = (byte*) " / " (signed word()) muls8s((signed byte) muls8s::a , (signed byte) muls8s::b) (label) muls8s::@1 (label) muls8s::@2 @@ -407,7 +407,7 @@ (byte*) print_char_cursor#86 print_char_cursor zp[2]:6 8.0 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:2 0.6428571428571428 (byte*) print_line_cursor#11 print_line_cursor zp[2]:2 0.09523809523809523 @@ -461,10 +461,10 @@ (word) print_word::w#4 w zp[2]:4 4.0 (word) print_word::w#5 w zp[2]:4 4.0 (word) print_word::w#6 w zp[2]:4 5.333333333333333 -(const byte*) str1[(byte) 2] = (string) "*" -(const byte*) str2[(byte) 7] = (string) " slow:" -(const byte*) str3[(byte) $b] = (string) " / normal:" -(const byte*) str4[(byte) 9] = (string) " / fast:" +(const byte*) str1[(byte) 2] = (byte*) "*" +(const byte*) str2[(byte) 7] = (byte*) " slow:" +(const byte*) str3[(byte) $b] = (byte*) " / normal:" +(const byte*) str4[(byte) 9] = (byte*) " / fast:" reg byte x [ mul8s_compare::ok#3 mul8s_compare::ok#4 ] reg byte a [ print_char::ch#6 print_char::ch#4 print_char::ch#5 ] diff --git a/src/test/ref/test-signed-word-minus-byte.log b/src/test/ref/test-signed-word-minus-byte.log index 075f24dca..021859904 100644 --- a/src/test/ref/test-signed-word-minus-byte.log +++ b/src/test/ref/test-signed-word-minus-byte.log @@ -520,7 +520,7 @@ SYMBOL TABLE SSA (void()) print_cls() (label) print_cls::@1 (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#0 (byte*) print_line_cursor#1 @@ -2126,7 +2126,7 @@ FINAL SYMBOL TABLE (byte*) print_char_cursor#63 print_char_cursor zp[2]:6 22.0 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:2 46.42857142857143 (byte*) print_line_cursor#19 print_line_cursor zp[2]:2 1.1818181818181819 diff --git a/src/test/ref/test-signed-word-minus-byte.sym b/src/test/ref/test-signed-word-minus-byte.sym index beb32f52e..dac2c2aac 100644 --- a/src/test/ref/test-signed-word-minus-byte.sym +++ b/src/test/ref/test-signed-word-minus-byte.sym @@ -60,7 +60,7 @@ (byte*) print_char_cursor#63 print_char_cursor zp[2]:6 22.0 (void()) print_cls() (label) print_cls::@return -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:2 46.42857142857143 (byte*) print_line_cursor#19 print_line_cursor zp[2]:2 1.1818181818181819 diff --git a/src/test/ref/textbox.log b/src/test/ref/textbox.log index b1cf48c26..f54f6da7c 100644 --- a/src/test/ref/textbox.log +++ b/src/test/ref/textbox.log @@ -638,8 +638,8 @@ SYMBOL TABLE SSA (byte) main::x#6 (byte) main::x#7 (const byte*) screen = (byte*)(number) $400 -(const byte*) text[] = (string) "this is a small test with word wrap, if a word is too long it moves it to the next line. isn't that supercalifragilisticexpialidocious? i think it's cool!" -(const byte*) text2[] = (string) "textbox by scan of desire" +(const byte*) text[] = (byte*) "this is a small test with word wrap, if a word is too long it moves it to the next line. isn't that supercalifragilisticexpialidocious? i think it's cool!" +(const byte*) text2[] = (byte*) "textbox by scan of desire" (void()) textbox((byte) textbox::x1 , (byte) textbox::y1 , (byte) textbox::x2 , (byte) textbox::y2 , (byte*) textbox::text) (number~) textbox::$1 (bool~) textbox::$10 @@ -4440,8 +4440,8 @@ FINAL SYMBOL TABLE (byte) main::x#1 x zp[1]:2 22.0 (byte) main::x#2 x zp[1]:2 8.0 (const byte*) screen = (byte*) 1024 -(const byte*) text[] = (string) "this is a small test with word wrap, if a word is too long it moves it to the next line. isn't that supercalifragilisticexpialidocious? i think it's cool!" -(const byte*) text2[] = (string) "textbox by scan of desire" +(const byte*) text[] = (byte*) "this is a small test with word wrap, if a word is too long it moves it to the next line. isn't that supercalifragilisticexpialidocious? i think it's cool!" +(const byte*) text2[] = (byte*) "textbox by scan of desire" (void()) textbox((byte) textbox::x1 , (byte) textbox::y1 , (byte) textbox::x2 , (byte) textbox::y2 , (byte*) textbox::text) (byte~) textbox::$16 reg byte y 101.0 (byte~) textbox::$18 zp[1]:10 101.0 diff --git a/src/test/ref/textbox.sym b/src/test/ref/textbox.sym index 4c84976d9..772485f66 100644 --- a/src/test/ref/textbox.sym +++ b/src/test/ref/textbox.sym @@ -92,8 +92,8 @@ (byte) main::x#1 x zp[1]:2 22.0 (byte) main::x#2 x zp[1]:2 8.0 (const byte*) screen = (byte*) 1024 -(const byte*) text[] = (string) "this is a small test with word wrap, if a word is too long it moves it to the next line. isn't that supercalifragilisticexpialidocious? i think it's cool!" -(const byte*) text2[] = (string) "textbox by scan of desire" +(const byte*) text[] = (byte*) "this is a small test with word wrap, if a word is too long it moves it to the next line. isn't that supercalifragilisticexpialidocious? i think it's cool!" +(const byte*) text2[] = (byte*) "textbox by scan of desire" (void()) textbox((byte) textbox::x1 , (byte) textbox::y1 , (byte) textbox::x2 , (byte) textbox::y2 , (byte*) textbox::text) (byte~) textbox::$16 reg byte y 101.0 (byte~) textbox::$18 zp[1]:10 101.0 diff --git a/src/test/ref/travis1.log b/src/test/ref/travis1.log index 37c1d0a0b..375c870d3 100644 --- a/src/test/ref/travis1.log +++ b/src/test/ref/travis1.log @@ -313,7 +313,7 @@ SYMBOL TABLE SSA (bool) game_ready::return#2 (bool) game_ready::return#3 (bool) game_ready::return#4 -(const byte*) game_ready::str[(byte) 6] = (string) "ready" +(const byte*) game_ready::str[(byte) 6] = (byte*) "ready" (void()) main() (bool~) main::$0 (bool~) main::$1 @@ -332,7 +332,7 @@ SYMBOL TABLE SSA (byte) main::i#4 (byte) main::i#5 (byte) main::i#6 -(const byte*) main::str[(byte) 7] = (string) "ready!" +(const byte*) main::str[(byte) 7] = (byte*) "ready!" (byte*) print_char_cursor (byte*) print_char_cursor#0 (byte*) print_char_cursor#1 @@ -1471,7 +1471,7 @@ FINAL SYMBOL TABLE (bool) game_ready::return (bool) game_ready::return#0 reg byte a 22.0 (bool) game_ready::return#1 reg byte a 4.333333333333333 -(const byte*) game_ready::str[(byte) 6] = (string) "ready" +(const byte*) game_ready::str[(byte) 6] = (byte*) "ready" (void()) main() (bool~) main::$0 reg byte a 22.0 (label) main::@1 @@ -1483,7 +1483,7 @@ FINAL SYMBOL TABLE (byte) main::i (byte) main::i#1 i zp[1]:2 11.0 (byte) main::i#2 i zp[1]:2 3.142857142857143 -(const byte*) main::str[(byte) 7] = (string) "ready!" +(const byte*) main::str[(byte) 7] = (byte*) "ready!" (byte*) print_char_cursor (byte*) print_char_cursor#17 print_char_cursor zp[2]:7 40.6 (byte*) print_char_cursor#27 print_char_cursor zp[2]:7 5.0 diff --git a/src/test/ref/travis1.sym b/src/test/ref/travis1.sym index 4dd2d280c..54482f5ac 100644 --- a/src/test/ref/travis1.sym +++ b/src/test/ref/travis1.sym @@ -18,7 +18,7 @@ (bool) game_ready::return (bool) game_ready::return#0 reg byte a 22.0 (bool) game_ready::return#1 reg byte a 4.333333333333333 -(const byte*) game_ready::str[(byte) 6] = (string) "ready" +(const byte*) game_ready::str[(byte) 6] = (byte*) "ready" (void()) main() (bool~) main::$0 reg byte a 22.0 (label) main::@1 @@ -30,7 +30,7 @@ (byte) main::i (byte) main::i#1 i zp[1]:2 11.0 (byte) main::i#2 i zp[1]:2 3.142857142857143 -(const byte*) main::str[(byte) 7] = (string) "ready!" +(const byte*) main::str[(byte) 7] = (byte*) "ready!" (byte*) print_char_cursor (byte*) print_char_cursor#17 print_char_cursor zp[2]:7 40.6 (byte*) print_char_cursor#27 print_char_cursor zp[2]:7 5.0 diff --git a/src/test/ref/type-signed.log b/src/test/ref/type-signed.log index 9c3ab3229..63791d33e 100644 --- a/src/test/ref/type-signed.log +++ b/src/test/ref/type-signed.log @@ -391,7 +391,7 @@ SYMBOL TABLE SSA (byte*) print_char_cursor#7 (byte*) print_char_cursor#8 (byte*) print_char_cursor#9 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#0 (byte*) print_line_cursor#1 @@ -1720,7 +1720,7 @@ FINAL SYMBOL TABLE (byte*) print_char_cursor#33 print_char_cursor zp[2]:11 11.5 (byte*) print_char_cursor#47 print_char_cursor zp[2]:11 2.142857142857143 (byte*) print_char_cursor#56 print_char_cursor zp[2]:11 22.0 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:6 46.42857142857143 (byte*) print_line_cursor#13 print_line_cursor zp[2]:6 1.1818181818181819 diff --git a/src/test/ref/type-signed.sym b/src/test/ref/type-signed.sym index 27355dd9c..3dfc3c6fa 100644 --- a/src/test/ref/type-signed.sym +++ b/src/test/ref/type-signed.sym @@ -42,7 +42,7 @@ (byte*) print_char_cursor#33 print_char_cursor zp[2]:11 11.5 (byte*) print_char_cursor#47 print_char_cursor zp[2]:11 2.142857142857143 (byte*) print_char_cursor#56 print_char_cursor zp[2]:11 22.0 -(const byte*) print_hextab[] = (string) "0123456789abcdef"z +(const byte*) print_hextab[] = (byte*) "0123456789abcdef"z (byte*) print_line_cursor (byte*) print_line_cursor#1 print_line_cursor zp[2]:6 46.42857142857143 (byte*) print_line_cursor#13 print_line_cursor zp[2]:6 1.1818181818181819 diff --git a/src/test/ref/var-export.log b/src/test/ref/var-export.log index 960be38c6..195ead90d 100644 --- a/src/test/ref/var-export.log +++ b/src/test/ref/var-export.log @@ -23,7 +23,7 @@ SYMBOL TABLE SSA (label) @2 (label) @begin (label) @end -(const byte*) MESSAGE[] = (string) "camelot!" +(const byte*) MESSAGE[] = (byte*) "camelot!" (const byte*) SCREEN = (byte*)(number) $400 (void()) main() (label) main::@return @@ -187,7 +187,7 @@ FINAL SYMBOL TABLE (label) @1 (label) @begin (label) @end -(const byte*) MESSAGE[] = (string) "camelot!" +(const byte*) MESSAGE[] = (byte*) "camelot!" (const byte*) SCREEN = (byte*) 1024 (void()) main() (label) main::@return diff --git a/src/test/ref/var-export.sym b/src/test/ref/var-export.sym index 69c965bca..cf234c6cd 100644 --- a/src/test/ref/var-export.sym +++ b/src/test/ref/var-export.sym @@ -1,7 +1,7 @@ (label) @1 (label) @begin (label) @end -(const byte*) MESSAGE[] = (string) "camelot!" +(const byte*) MESSAGE[] = (byte*) "camelot!" (const byte*) SCREEN = (byte*) 1024 (void()) main() (label) main::@return diff --git a/src/test/ref/var-register-noarg.log b/src/test/ref/var-register-noarg.log index 8cfb3ce4b..d92df3ddb 100644 --- a/src/test/ref/var-register-noarg.log +++ b/src/test/ref/var-register-noarg.log @@ -38,7 +38,7 @@ SYMBOL TABLE SSA (label) @2 (label) @begin (label) @end -(const byte*) MSG[] = (string) "CAMELOT!"su +(const byte*) MSG[] = (byte*) "CAMELOT!"su (const byte*) SCREEN = (byte*)(number) $400 (void()) main() (bool~) main::$0 @@ -308,7 +308,7 @@ FINAL SYMBOL TABLE (label) @1 (label) @begin (label) @end -(const byte*) MSG[] = (string) "CAMELOT!"su +(const byte*) MSG[] = (byte*) "CAMELOT!"su (const byte*) SCREEN = (byte*) 1024 (void()) main() (byte~) main::$1 reg byte a 22.0 diff --git a/src/test/ref/var-register-noarg.sym b/src/test/ref/var-register-noarg.sym index 9901d0752..26a95d141 100644 --- a/src/test/ref/var-register-noarg.sym +++ b/src/test/ref/var-register-noarg.sym @@ -1,7 +1,7 @@ (label) @1 (label) @begin (label) @end -(const byte*) MSG[] = (string) "CAMELOT!"su +(const byte*) MSG[] = (byte*) "CAMELOT!"su (const byte*) SCREEN = (byte*) 1024 (void()) main() (byte~) main::$1 reg byte a 22.0 diff --git a/src/test/ref/var-register-zp-3.log b/src/test/ref/var-register-zp-3.log index 21efc1d06..7248f3002 100644 --- a/src/test/ref/var-register-zp-3.log +++ b/src/test/ref/var-register-zp-3.log @@ -84,8 +84,8 @@ SYMBOL TABLE SSA (label) main::@1 (label) main::@2 (label) main::@return -(const byte*) main::msg[(byte) 6] = (string) "hello" -(const byte*) main::msg1[(byte) 6] = (string) "world" +(const byte*) main::msg[(byte) 6] = (byte*) "hello" +(const byte*) main::msg1[(byte) 6] = (byte*) "world" (void()) print2((byte*) print2::at , (byte*) print2::msg) (bool~) print2::$1 (label) print2::@1 @@ -632,8 +632,8 @@ FINAL SYMBOL TABLE (void()) main() (label) main::@1 (label) main::@return -(const byte*) main::msg[(byte) 6] = (string) "hello" -(const byte*) main::msg1[(byte) 6] = (string) "world" +(const byte*) main::msg[(byte) 6] = (byte*) "hello" +(const byte*) main::msg1[(byte) 6] = (byte*) "world" (void()) print2((byte*) print2::at , (byte*) print2::msg) (label) print2::@1 (label) print2::@2 diff --git a/src/test/ref/var-register-zp-3.sym b/src/test/ref/var-register-zp-3.sym index 482ef87ea..55afbb9e7 100644 --- a/src/test/ref/var-register-zp-3.sym +++ b/src/test/ref/var-register-zp-3.sym @@ -4,8 +4,8 @@ (void()) main() (label) main::@1 (label) main::@return -(const byte*) main::msg[(byte) 6] = (string) "hello" -(const byte*) main::msg1[(byte) 6] = (string) "world" +(const byte*) main::msg[(byte) 6] = (byte*) "hello" +(const byte*) main::msg1[(byte) 6] = (byte*) "world" (void()) print2((byte*) print2::at , (byte*) print2::msg) (label) print2::@1 (label) print2::@2