6502/kickc
1
0
Fork 0
mirror of https://gitlab.com/camelot/kickc.git synced 2025-04-05 07:40:39 +00:00
Code Issues Projects Releases Wiki Activity

Implemented ArraySpec

Browse Source
This commit is contained in:
jespergravgaard 2019-11-21 23:37:53 +01:00
parent 397680ea9c
commit f3c388b753
21 changed files with 84 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/dk/camelot64/kickc/model/CallingConventionStack.java
View File

@ -23,7 +23,7 @@ public class CallingConventionStack {
if(returnOffsetConstant == null) {
// Constant not found - create it
long returnByteOffset = getReturnByteOffset(procedure);
returnOffsetConstant = new Variable(returnOffsetConstantName, procedure, SymbolType.BYTE, false, Scope.SEGMENT_DATA_DEFAULT, new ConstantInteger(returnByteOffset & 0xff, SymbolType.BYTE));
returnOffsetConstant = new Variable(returnOffsetConstantName, procedure, SymbolType.BYTE, null, Scope.SEGMENT_DATA_DEFAULT, new ConstantInteger(returnByteOffset & 0xff, SymbolType.BYTE));
procedure.add(returnOffsetConstant);
}
return returnOffsetConstant.getConstantRef();
@ -42,7 +42,7 @@ public class CallingConventionStack {
if(paramOffsetConstant == null) {
// Constant not found - create it
long paramByteOffset = getParameterByteOffset(procedure, parameter);
paramOffsetConstant = new Variable(paramOffsetConstantName, procedure, SymbolType.BYTE, false, Scope.SEGMENT_DATA_DEFAULT, new ConstantInteger(paramByteOffset & 0xff, SymbolType.BYTE));
paramOffsetConstant = new Variable(paramOffsetConstantName, procedure, SymbolType.BYTE, null, Scope.SEGMENT_DATA_DEFAULT, new ConstantInteger(paramByteOffset & 0xff, SymbolType.BYTE));
procedure.add(paramOffsetConstant);
}
return paramOffsetConstant.getConstantRef();
@ -123,7 +123,7 @@ public class CallingConventionStack {
*/
public static ConstantRef getStackBaseConstant(ProgramScope programScope) {
long STACK_BASE_ADDRESS = 0x103L;
Variable stackBase = new Variable("STACK_BASE", programScope, SymbolType.WORD, false, Scope.SEGMENT_DATA_DEFAULT, new ConstantInteger(STACK_BASE_ADDRESS, SymbolType.WORD));
Variable stackBase = new Variable("STACK_BASE", programScope, SymbolType.WORD, null, Scope.SEGMENT_DATA_DEFAULT, new ConstantInteger(STACK_BASE_ADDRESS, SymbolType.WORD));
programScope.add(stackBase);
return stackBase.getConstantRef();
}

4
src/main/java/dk/camelot64/kickc/model/iterator/ProgramValue.java
View File

@ -936,12 +936,12 @@ public interface ProgramValue {
@Override
public Value get() {
return variable.getArraySize();
return variable.getArraySpec().getArraySize();
}
@Override
public void set(Value val) {
variable.setArraySize((ConstantValue) val);
variable.getArraySpec().setArraySize((ConstantValue) val);
}
}

2
src/main/java/dk/camelot64/kickc/model/iterator/ProgramValueIterator.java
View File

@ -51,7 +51,7 @@ public class ProgramValueIterator {
if(variable.isConstant()) {
execute(new ProgramValue.ProgramValueConstantVar(variable), programValueHandler, null, null, null);
}
if(variable.getArraySize()!=null) {
if(variable.isArray()) {
execute(new ProgramValue.ProgramValueArraySize(variable), programValueHandler, null, null, null);
}
}

2
src/main/java/dk/camelot64/kickc/model/operators/OperatorSizeOf.java
View File

@ -42,7 +42,7 @@ public class OperatorSizeOf extends OperatorUnary {
if(typeSizeConstant == null) {
// Constant not found - create it
long typeSize = type.getSizeBytes();
typeSizeConstant = new Variable(typeConstName, programScope, SymbolType.BYTE, false, Scope.SEGMENT_DATA_DEFAULT, new ConstantInteger(typeSize&0xff, SymbolType.BYTE));
typeSizeConstant = new Variable(typeConstName, programScope, SymbolType.BYTE, null, Scope.SEGMENT_DATA_DEFAULT, new ConstantInteger(typeSize&0xff, SymbolType.BYTE));
programScope.add(typeSizeConstant);
}
return typeSizeConstant.getConstantRef();

2
src/main/java/dk/camelot64/kickc/model/operators/OperatorTypeId.java
View File

@ -47,7 +47,7 @@ public class OperatorTypeId extends OperatorUnary {
if(typeIdConstant == null) {
// Constant not found - create it
long typeSize = getTypeId(type);
typeIdConstant = new Variable(typeConstName, programScope, SymbolType.BYTE, false, Scope.SEGMENT_DATA_DEFAULT, new ConstantInteger(typeSize));
typeIdConstant = new Variable(typeConstName, programScope, SymbolType.BYTE, null, Scope.SEGMENT_DATA_DEFAULT, new ConstantInteger(typeSize));
programScope.add(typeIdConstant);
}
return typeIdConstant.getConstantRef();

28
src/main/java/dk/camelot64/kickc/model/symbols/ArraySpec.java Normal file
View File

@ -0,0 +1,28 @@
package dk.camelot64.kickc.model.symbols;
import dk.camelot64.kickc.model.values.ConstantValue;
/** Specification of array properties of a variable.
* The presence of this means the variable is an array.
* If the size of the array is fixed this will contain the size.
* */
public class ArraySpec {
/** If the variable is a fixed size array this is the fixed size of the array. */
private ConstantValue arraySize;
public ArraySpec() {
}
public ArraySpec(ConstantValue arraySize) {
this.arraySize = arraySize;
}
public ConstantValue getArraySize() {
return arraySize;
}
public void setArraySize(ConstantValue arraySize) {
this.arraySize = arraySize;
}
}

2
src/main/java/dk/camelot64/kickc/model/symbols/StructDefinition.java
View File

@ -43,7 +43,7 @@ public class StructDefinition extends Scope {
if(structMember.equals(member)) {
break;
} else {
byteOffset += SymbolTypeStruct.getMemberSizeBytes(structMember.getType(), structMember.isArray(), structMember.getArraySize(), programScope);
byteOffset += SymbolTypeStruct.getMemberSizeBytes(structMember.getType(), structMember.getArraySpec(), programScope);
}
}
return byteOffset;

31
src/main/java/dk/camelot64/kickc/model/symbols/Variable.java
View File

@ -39,11 +39,8 @@ public class Variable implements Symbol {
/** True of the variable is a compile-time constant (previously ConstantVar) [ALL] TODO: Eliminate (use Kind.CONSTANT) */
private boolean isConstant;
/** True if the variable is an array. */
private boolean isArray;
/** If the variable is a fixed size array this is the fixed size of the array. */
private ConstantValue arraySize;
/** Non-null if teh variable is an array. */
private ArraySpec arraySpec;
/** The local name of the variable. [ALL] */
private String name;
@ -112,12 +109,12 @@ public class Variable implements Symbol {
* @param dataSegment The data segment (in main memory)
* @param value The constant value
*/
public Variable(String name, Scope scope, SymbolType type, boolean isArray, String dataSegment, ConstantValue value) {
public Variable(String name, Scope scope, SymbolType type, ArraySpec arraySpec, String dataSegment, ConstantValue value) {
this.isConstant = true;
this.name = name;
this.scope = scope;
this.type = type;
this.isArray = isArray;
this.arraySpec = arraySpec;
this.dataSegment = dataSegment;
this.kind = Kind.CONSTANT;
this.memoryArea = MemoryArea.MAIN_MEMORY;
@ -158,8 +155,7 @@ public class Variable implements Symbol {
*/
public Variable(Variable phiMaster, int version) {
this(false, phiMaster.getName() + "#" + version, phiMaster.getScope(), phiMaster.getType(), Kind.PHI_VERSION, phiMaster.getMemoryArea(), phiMaster.getDataSegment());
this.setArray(phiMaster.isArray());
this.setArraySize(phiMaster.getArraySize());
this.setArraySpec(phiMaster.getArraySpec());
this.setDeclaredAlignment(phiMaster.getDeclaredAlignment());
this.setDeclaredAsRegister(phiMaster.isDeclaredAsRegister());
this.setDeclaredConst(phiMaster.isDeclaredConst());
@ -179,8 +175,7 @@ public class Variable implements Symbol {
*/
public Variable(String name, Scope scope, Variable original) {
this(original.isConstant(), name, scope, original.getType(), original.getKind(), original.getMemoryArea(), original.getDataSegment());
this.setArray(original.isArray());
this.setArraySize(original.getArraySize());
this.setArraySpec(original.getArraySpec());
this.setDeclaredAlignment(original.getDeclaredAlignment());
this.setDeclaredAsRegister(original.isDeclaredAsRegister());
this.setDeclaredConst(original.isDeclaredConst());
@ -285,19 +280,15 @@ public class Variable implements Symbol {
}
public boolean isArray() {
return isArray;
return arraySpec!=null;
}
public void setArray(boolean array) {
isArray = array;
public ArraySpec getArraySpec() {
return arraySpec;
}
public ConstantValue getArraySize() {
return arraySize;
}
public void setArraySize(ConstantValue arraySize) {
this.arraySize = arraySize;
public void setArraySpec(ArraySpec arraySpec) {
this.arraySpec = arraySpec;
}
public Registers.Register getAllocation() {

10
src/main/java/dk/camelot64/kickc/model/types/SymbolTypeStruct.java
View File

@ -1,11 +1,11 @@
package dk.camelot64.kickc.model.types;
import dk.camelot64.kickc.model.symbols.ArraySpec;
import dk.camelot64.kickc.model.symbols.ProgramScope;
import dk.camelot64.kickc.model.symbols.StructDefinition;
import dk.camelot64.kickc.model.symbols.Variable;
import dk.camelot64.kickc.model.values.ConstantInteger;
import dk.camelot64.kickc.model.values.ConstantLiteral;
import dk.camelot64.kickc.model.values.ConstantValue;
import java.util.Objects;
@ -55,16 +55,16 @@ public class SymbolTypeStruct implements SymbolType {
int sizeBytes = 0;
for(Variable member : structDefinition.getAllVariables(false)) {
SymbolType memberType = member.getType();
int memberSize = getMemberSizeBytes(memberType, member.isArray(), member.getArraySize(), programScope);
int memberSize = getMemberSizeBytes(memberType, member.getArraySpec(), programScope);
sizeBytes += memberSize;
}
return sizeBytes;
}
public static int getMemberSizeBytes(SymbolType memberType, boolean isArray, ConstantValue memberArraySize, ProgramScope programScope) {
if(isArray && memberArraySize != null) {
public static int getMemberSizeBytes(SymbolType memberType, ArraySpec arraySpec, ProgramScope programScope) {
if(arraySpec!=null && arraySpec.getArraySize() != null) {
if(programScope != null) {
ConstantLiteral sizeLiteral = memberArraySize.calculateLiteral(programScope);
ConstantLiteral sizeLiteral = arraySpec.getArraySize().calculateLiteral(programScope);
if(sizeLiteral instanceof ConstantInteger) {
return ((ConstantInteger) sizeLiteral).getInteger().intValue();
}

18
src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java
View File

@ -582,7 +582,7 @@ public class Pass0GenerateStatementSequence extends KickCParserBaseVisitor<Objec
if(lValue.isArray()) {
// Add an zero-filled array initializer
SymbolTypePointer typePointer = (SymbolTypePointer) type;
ConstantValue arraySize = lValue.getArraySize();
ConstantValue arraySize = lValue.getArraySpec().getArraySize();
if(arraySize == null) {
throw new CompileError("Error! Array has no declared size. " + lValue.toString(), statementSource);
}
@ -602,7 +602,7 @@ public class Pass0GenerateStatementSequence extends KickCParserBaseVisitor<Objec
sequence.addStatement(initStmt);
}
if(initializer!=null) {
if(initializer != null) {
PrePostModifierHandler.addPostModifiers(this, initializer, statementSource);
}
@ -651,12 +651,7 @@ public class Pass0GenerateStatementSequence extends KickCParserBaseVisitor<Objec
// Create variable
Variable lValue = getCurrentScope().addVariable(kind, varName, type, defaultMemoryArea, currentDataSegment);
if(declIsArray) {
lValue.setArray(true);
if(declArraySize != null) {
if(!(declArraySize instanceof ConstantValue))
throw new CompileError("Error! Array size not constant " + declArraySize.toString(program), new StatementSource(ctx));
lValue.setArraySize((ConstantValue) declArraySize);
}
lValue.setArraySpec(new ArraySpec(declArraySize));
}
// Add directives
directiveContext.applyDirectives(lValue, false, declIsArray, directives, new StatementSource(ctx));
@ -1472,9 +1467,8 @@ public class Pass0GenerateStatementSequence extends KickCParserBaseVisitor<Objec
}
// Convert to a constant value
scope.remove(lValue);
Variable constVar = new Variable(lValue.getName(), scope, lValue.getType(), lValue.isArray(), lValue.getDataSegment(), constantValue);
Variable constVar = new Variable(lValue.getName(), scope, lValue.getType(), lValue.getArraySpec(), lValue.getDataSegment(), constantValue);
scope.add(constVar);
constVar.setArraySize(lValue.getArraySize());
constVar.setDeclaredConst(lValue.isDeclaredConst());
constVar.setDeclaredRegister(lValue.getDeclaredRegister());
constVar.setMemoryArea(lValue.getMemoryArea());
@ -1558,7 +1552,7 @@ public class Pass0GenerateStatementSequence extends KickCParserBaseVisitor<Objec
Scope parentScope = getCurrentScope();
while(parentScope instanceof StructDefinition) parentScope = parentScope.getScope();
for(Variable member : enumDefinition.getAllConstants(false)) {
parentScope.add(new Variable(member.getLocalName(), parentScope, SymbolType.BYTE, false, currentDataSegment, member.getConstantValue()));
parentScope.add(new Variable(member.getLocalName(), parentScope, SymbolType.BYTE, null, currentDataSegment, member.getConstantValue()));
}
return SymbolType.BYTE;
} catch(CompileError e) {
@ -1592,7 +1586,7 @@ public class Pass0GenerateStatementSequence extends KickCParserBaseVisitor<Objec
}
}
}
currentEnum.add(new Variable(memberName, getCurrentScope(), SymbolType.BYTE, false, currentDataSegment, enumValue));
currentEnum.add(new Variable(memberName, getCurrentScope(), SymbolType.BYTE, null, currentDataSegment, enumValue));
return null;
}

3
src/main/java/dk/camelot64/kickc/passes/Pass1EarlyConstantIdentification.java
View File

@ -120,8 +120,7 @@ public class Pass1EarlyConstantIdentification extends Pass1Base {
SymbolVariableRef variableRef = variable.getRef();
Scope scope = variable.getScope();
scope.remove(variable);
Variable constVar = new Variable(variable.getName(), scope, variable.getType(), variable.isArray(), variable.getDataSegment(), constantValue);
constVar.setArraySize(variable.getArraySize());
Variable constVar = new Variable(variable.getName(), scope, variable.getType(), variable.getArraySpec(), variable.getDataSegment(), constantValue);
constVar.setDeclaredAlignment(variable.getDeclaredAlignment());
constVar.setDeclaredAsRegister(variable.isDeclaredAsRegister());
constVar.setDeclaredConst(variable.isDeclaredConst());

3
src/main/java/dk/camelot64/kickc/passes/Pass1ExtractInlineStrings.java
View File

@ -4,6 +4,7 @@ import dk.camelot64.kickc.model.Program;
import dk.camelot64.kickc.model.iterator.ProgramValueIterator;
import dk.camelot64.kickc.model.statements.StatementCall;
import dk.camelot64.kickc.model.statements.StatementCallPrepare;
import dk.camelot64.kickc.model.symbols.ArraySpec;
import dk.camelot64.kickc.model.symbols.Procedure;
import dk.camelot64.kickc.model.symbols.Scope;
import dk.camelot64.kickc.model.symbols.Variable;
@ -73,7 +74,7 @@ public class Pass1ExtractInlineStrings extends Pass1Base {
name = nameHint + nameHintIdx++;
}
}
Variable strConst = new Variable(name, blockScope, SymbolType.STRING, true, blockScope.getSegmentData(), constantString);
Variable strConst = new Variable(name, blockScope, SymbolType.STRING, new ArraySpec(), blockScope.getSegmentData(), constantString);
blockScope.add(strConst);
if(getLog().isVerbosePass1CreateSsa()) {
getLog().append("Creating constant string variable for inline " + strConst.toString(getProgram()) + " \"" + constantString.getValue() + "\"");

3
src/main/java/dk/camelot64/kickc/passes/Pass1UnwindStructValues.java
View File

@ -213,8 +213,7 @@ public class Pass1UnwindStructValues extends Pass1Base {
String name = variable.getLocalName() + "_" + member.getLocalName();
Variable.MemoryArea memoryArea = (member.getType() instanceof SymbolTypePointer)?Variable.MemoryArea.ZEROPAGE_MEMORY:variable.getMemoryArea();
Variable memberVariable = scope.add(new Variable( false, name, scope, member.getType(), variable.getKind(), memoryArea, variable.getDataSegment()));
memberVariable.setArray(member.isArray());
memberVariable.setArraySize(member.getArraySize());
memberVariable.setArraySpec(member.getArraySpec());
memberVariable.setDeclaredVolatile(variable.isDeclaredVolatile());
memberVariable.setInferredVolatile(variable.isInferredVolatile());
memberVariable.setDeclaredConst(variable.isDeclaredConst());

2
src/main/java/dk/camelot64/kickc/passes/Pass2ArrayInStructInlining.java
View File

@ -57,7 +57,7 @@ public class Pass2ArrayInStructInlining extends Pass2SsaOptimization {
if(programValue instanceof ProgramValue.ProgramValueConstantStructMember) {
SymbolVariableRef memberRef = ((ProgramValue.ProgramValueConstantStructMember) programValue).getMemberRef();
Variable structMemberVar = getScope().getVariable(memberRef);
if(structMemberVar.isArray() && structMemberVar.getArraySize() != null) {
if(structMemberVar.isArray() && structMemberVar.getArraySpec().getArraySize() != null) {
if(value instanceof ConstantValue) {
ConstantValue constantValue = (ConstantValue) value;
if(constantValue.getType(getProgram().getScope()).equals(SymbolType.STRING)) {

3
src/main/java/dk/camelot64/kickc/passes/Pass2ConstantIdentification.java
View File

@ -73,10 +73,9 @@ public class Pass2ConstantIdentification extends Pass2SsaOptimization {
variable.getName(),
constScope,
variableType,
variable.isArray(),
variable.getArraySpec(),
variable.getDataSegment(), constVal
);
constantVar.setArraySize(variable.getArraySize());
constantVar.setDeclaredAlignment(variable.getDeclaredAlignment());
constantVar.setDeclaredAsRegister(variable.isDeclaredAsRegister());
constantVar.setDeclaredRegister(variable.getDeclaredRegister());

3
src/main/java/dk/camelot64/kickc/passes/Pass2ConstantStringConsolidation.java
View File

@ -1,6 +1,7 @@
package dk.camelot64.kickc.passes;
import dk.camelot64.kickc.model.Program;
import dk.camelot64.kickc.model.symbols.ArraySpec;
import dk.camelot64.kickc.model.symbols.ProgramScope;
import dk.camelot64.kickc.model.symbols.Variable;
import dk.camelot64.kickc.model.types.SymbolType;
@ -92,7 +93,7 @@ public class Pass2ConstantStringConsolidation extends Pass2SsaOptimization {
// Create a new root - and roll around again
ProgramScope rootScope = getScope();
String localName = getRootName(constantVars);
Variable newRootConstant = new Variable(localName, rootScope, SymbolType.STRING, true, segmentData, constString);
Variable newRootConstant = new Variable(localName, rootScope, SymbolType.STRING, new ArraySpec(), segmentData, constString);
rootScope.add(newRootConstant);
rootConstant = newRootConstant;
}

4
src/main/java/dk/camelot64/kickc/passes/Pass3AssertArrayLengths.java
View File

@ -22,8 +22,8 @@ public class Pass3AssertArrayLengths extends Pass2SsaAssertion {
Collection<Variable> allConstants = getScope().getAllConstants(true);
for(Variable constantVar : allConstants) {
SymbolType constantType = constantVar.getType();
if(constantVar.isArray() && constantVar.getArraySize() != null) {
ConstantValue declaredSize = constantVar.getArraySize();
if(constantVar.isArray() && constantVar.getArraySpec().getArraySize() != null) {
ConstantValue declaredSize = constantVar.getArraySpec().getArraySize();
ConstantLiteral declaredSizeVal = declaredSize.calculateLiteral(getScope());
if(!(declaredSizeVal instanceof ConstantInteger)) {
throw new CompileError("Error! Array declared size is not integer " + constantType.toString());

26
src/main/java/dk/camelot64/kickc/passes/Pass4CodeGeneration.java
View File

@ -9,10 +9,7 @@ import dk.camelot64.kickc.model.iterator.ProgramValueHandler;
import dk.camelot64.kickc.model.iterator.ProgramValueIterator;
import dk.camelot64.kickc.model.operators.Operators;
import dk.camelot64.kickc.model.statements.*;
import dk.camelot64.kickc.model.symbols.Procedure;
import dk.camelot64.kickc.model.symbols.ProgramScope;
import dk.camelot64.kickc.model.symbols.Scope;
import dk.camelot64.kickc.model.symbols.Variable;
import dk.camelot64.kickc.model.symbols.*;
import dk.camelot64.kickc.model.types.*;
import dk.camelot64.kickc.model.values.*;
import dk.camelot64.kickc.passes.calcs.PassNCalcVariableReferenceInfos;
@ -488,7 +485,7 @@ public class Pass4CodeGeneration {
ConstantValue constantValue = constantVar.getConstantValue();
if(constantValue instanceof ConstantArray || constantValue instanceof ConstantString) {
AsmDataChunk asmDataChunk = new AsmDataChunk();
addChunkData(asmDataChunk, constantValue, constantVar.getType(), constantVar.isArray(), constantVar.getArraySize(), scopeRef);
addChunkData(asmDataChunk, constantValue, constantVar.getType(), constantVar.getArraySpec(), scopeRef);
asmDataChunk.addToAsm(AsmFormat.asmFix(asmName), asm);
} else {
throw new InternalError("Constant Variable not handled " + constantVar.toString(program));
@ -531,7 +528,7 @@ public class Pass4CodeGeneration {
asm.addDataAlignment(alignment);
}
AsmDataChunk asmDataChunk = new AsmDataChunk();
addChunkData(asmDataChunk, ZeroConstantValues.zeroValue(variable.getType(), getScope()), variable.getType(), variable.isArray(), variable.getArraySize(), scopeRef);
addChunkData(asmDataChunk, ZeroConstantValues.zeroValue(variable.getType(), getScope()), variable.getType(), variable.getArraySpec(), scopeRef);
asmDataChunk.addToAsm(AsmFormat.asmFix(variable.getAsmName()), asm);
added.add(variable.getAsmName());
}
@ -566,20 +563,19 @@ public class Pass4CodeGeneration {
* @param dataChunk The data chunk
* @param value The constant value
* @param valueType The declared type of the value
* @param valueArray true if the value is declared as an array
* @param valueArraySize the decalred size of the array value (if array with a declared size)
* @param valueArraySpec The array properties of the value
* @param scopeRef The scope containing the data chunk
*/
private void addChunkData(AsmDataChunk dataChunk, ConstantValue value, SymbolType valueType, boolean valueArray, ConstantValue valueArraySize, ScopeRef scopeRef) {
private void addChunkData(AsmDataChunk dataChunk, ConstantValue value, SymbolType valueType, ArraySpec valueArraySpec, ScopeRef scopeRef) {
if(valueType instanceof SymbolTypeStruct) {
// Add each struct member recursively
ConstantStructValue structValue = (ConstantStructValue) value;
for(SymbolVariableRef memberRef : structValue.getMembers()) {
ConstantValue memberValue = structValue.getValue(memberRef);
Variable memberVariable = getScope().getVariable(memberRef);
addChunkData(dataChunk, memberValue, memberVariable.getType(), memberVariable.isArray(), memberVariable.getArraySize(), scopeRef);
addChunkData(dataChunk, memberValue, memberVariable.getType(), memberVariable.getArraySpec(), scopeRef);
}
} else if(valueType instanceof SymbolTypePointer && valueArray) {
} else if(valueType instanceof SymbolTypePointer && valueArraySpec!=null) {
SymbolTypePointer constTypeArray = (SymbolTypePointer) valueType;
SymbolType elementType = constTypeArray.getElementType();
@ -612,7 +608,7 @@ public class Pass4CodeGeneration {
ConstantArrayKickAsm kickAsm = (ConstantArrayKickAsm) value;
// default - larger then 256
int bytes = 1023;
Integer declaredSize = getArrayDeclaredSize(valueArraySize);
Integer declaredSize = getArrayDeclaredSize(valueArraySpec.getArraySize());
if(declaredSize!=null) {
bytes = declaredSize * elementType.getSizeBytes();
}
@ -638,13 +634,13 @@ public class Pass4CodeGeneration {
ConstantArrayList constantArrayList = (ConstantArrayList) value;
// Output each element to the chunk
for(ConstantValue element : constantArrayList.getElements()) {
addChunkData(dataChunk, element, elementType, false, null, scopeRef);
addChunkData(dataChunk, element, elementType, null, scopeRef);
}
dataNumElements = constantArrayList.getElements().size();
}
// Pad output to match declared size (if larger than the data list)
if(!(value instanceof ConstantArrayKickAsm)) {
Integer declaredSize = getArrayDeclaredSize(valueArraySize);
Integer declaredSize = getArrayDeclaredSize(valueArraySpec.getArraySize());
if(declaredSize != null && declaredSize > dataNumElements) {
int padding = declaredSize - dataNumElements;
ConstantValue zeroValue = ZeroConstantValues.zeroValue(elementType, program.getScope());
@ -652,7 +648,7 @@ public class Pass4CodeGeneration {
dataChunk.addDataFilled(getNumericType(elementType), AsmFormat.getAsmNumber(padding), padding, AsmFormat.getAsmConstant(program, zeroValue, 99, scopeRef), getEncoding(zeroValue));
} else {
for(int i = 0; i < padding; i++) {
addChunkData(dataChunk, zeroValue, elementType, false, null, scopeRef);
addChunkData(dataChunk, zeroValue, elementType, null, scopeRef);
}
}
}

2
src/main/java/dk/camelot64/kickc/passes/PassNSizeOfSimplification.java
View File

@ -72,7 +72,7 @@ public class PassNSizeOfSimplification extends Pass2SsaOptimization {
SymbolType symbolType = constant.getType();
if(constant.isArray() && symbolType instanceof SymbolTypePointer) {
SymbolTypePointer arrayType = (SymbolTypePointer) symbolType;
RValue arraySize = constant.getArraySize();
ConstantValue arraySize = constant.getArraySpec().getArraySize();
if(arraySize instanceof ConstantValue) {
getLog().append("Resolving array sizeof() " + unary.toString(getProgram()));
ConstantRef sizeOfConstantVar = OperatorSizeOf.getSizeOfConstantVar(getScope(), arrayType.getElementType());

6
src/main/java/dk/camelot64/kickc/passes/PassNStructPointerRewriting.java
View File

@ -40,7 +40,7 @@ public class PassNStructPointerRewriting extends Pass2SsaOptimization {
SymbolType memberType = SymbolTypeInference.inferType(getScope(), structMemberRef);
Variable memberVar = structDefinition.getMember(structMemberRef.getMemberName());
getLog().append("Rewriting struct pointer member access " + programValue.get().toString(getProgram()));
if(memberVar.isArray() && memberVar.getArraySize()!=null) {
if(memberVar.isArray() && memberVar.getArraySpec().getArraySize()!=null) {
// Cast struct pointer to the type of the member
CastValue structTypedPointer = new CastValue(memberType, structPointer);
// Create temporary variable to hold pointer to member ($1)
@ -80,7 +80,7 @@ public class PassNStructPointerRewriting extends Pass2SsaOptimization {
SymbolType memberType = SymbolTypeInference.inferType(getScope(), structMemberRef);
Variable memberVar = structDefinition.getMember(structMemberRef.getMemberName());
getLog().append("Rewriting struct pointer member access " + programValue.get().toString(getProgram()));
if(memberVar.isArray() && memberVar.getArraySize()!=null) {
if(memberVar.isArray() && memberVar.getArraySpec().getArraySize()!=null) {
// Cast struct pointer to the type of the member
CastValue structTypedPointer = new CastValue(memberType, structPointer);
// Create temporary variable to hold pointer to member ($1)
@ -133,7 +133,7 @@ public class PassNStructPointerRewriting extends Pass2SsaOptimization {
// Constant not found - create it
Variable memberDef = structDefinition.getMember(memberName);
long memberByteOffset = structDefinition.getMemberByteOffset(memberDef, programScope);
memberOffsetConstant = new Variable(typeConstName, programScope, SymbolType.BYTE, false, Scope.SEGMENT_DATA_DEFAULT, new ConstantInteger(memberByteOffset & 0xff, SymbolType.BYTE));
memberOffsetConstant = new Variable(typeConstName, programScope, SymbolType.BYTE, null, Scope.SEGMENT_DATA_DEFAULT, new ConstantInteger(memberByteOffset & 0xff, SymbolType.BYTE));
programScope.add(memberOffsetConstant);
}
return memberOffsetConstant.getConstantRef();

1
src/test/kc/unary-plus.kc
View File

@ -13,5 +13,4 @@ void main() {
SCREEN2[0] = j;
SCREEN2[1] = +3;
}