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

Added syntax for kasm-initialization of arrays.

Browse Source
This commit is contained in:
Jesper Gravgaard 2019-06-30 15:48:31 +02:00
parent 30068dbf92
commit 44c5aa1313
8 changed files with 859 additions and 746 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/dk/camelot64/kickc/parser/KickC.g4
View File

@ -50,7 +50,8 @@ declVariableList
;
declVariableInit
: NAME ('=' expr)?
: NAME ('=' expr)? #declVariableInitExpr
| NAME ('=' declKasm)? #declVariableInitKasm
;
declFunction

18
src/main/java/dk/camelot64/kickc/parser/KickCBaseListener.java
View File

@ -1,4 +1,4 @@
// Generated from /Users/jespergravgaard/c64/kickc/src/main/java/dk/camelot64/kickc/parser/KickC.g4 by ANTLR 4.7
// Generated from C:/c64/kickc/src/main/java/dk/camelot64/kickc/parser\KickC.g4 by ANTLR 4.7
package dk.camelot64.kickc.parser;
import org.antlr.v4.runtime.ParserRuleContext;
@ -136,13 +136,25 @@ public class KickCBaseListener implements KickCListener {
*
* <p>The default implementation does nothing.</p>
*/
@Override public void enterDeclVariableInit(KickCParser.DeclVariableInitContext ctx) { }
@Override public void enterDeclVariableInitExpr(KickCParser.DeclVariableInitExprContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void exitDeclVariableInit(KickCParser.DeclVariableInitContext ctx) { }
@Override public void exitDeclVariableInitExpr(KickCParser.DeclVariableInitExprContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void enterDeclVariableInitKasm(KickCParser.DeclVariableInitKasmContext ctx) { }
/**
* {@inheritDoc}
*
* <p>The default implementation does nothing.</p>
*/
@Override public void exitDeclVariableInitKasm(KickCParser.DeclVariableInitKasmContext ctx) { }
/**
* {@inheritDoc}
*

11
src/main/java/dk/camelot64/kickc/parser/KickCBaseVisitor.java
View File

@ -1,4 +1,4 @@
// Generated from /Users/jespergravgaard/c64/kickc/src/main/java/dk/camelot64/kickc/parser/KickC.g4 by ANTLR 4.7
// Generated from C:/c64/kickc/src/main/java/dk/camelot64/kickc/parser\KickC.g4 by ANTLR 4.7
package dk.camelot64.kickc.parser;
import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor;
@ -87,7 +87,14 @@ public class KickCBaseVisitor<T> extends AbstractParseTreeVisitor<T> implements
* <p>The default implementation returns the result of calling
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitDeclVariableInit(KickCParser.DeclVariableInitContext ctx) { return visitChildren(ctx); }
@Override public T visitDeclVariableInitExpr(KickCParser.DeclVariableInitExprContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*
* <p>The default implementation returns the result of calling
* {@link #visitChildren} on {@code ctx}.</p>
*/
@Override public T visitDeclVariableInitKasm(KickCParser.DeclVariableInitKasmContext ctx) { return visitChildren(ctx); }
/**
* {@inheritDoc}
*

2
src/main/java/dk/camelot64/kickc/parser/KickCLexer.java
View File

@ -1,4 +1,4 @@
// Generated from /Users/jespergravgaard/c64/kickc/src/main/java/dk/camelot64/kickc/parser/KickC.g4 by ANTLR 4.7
// Generated from C:/c64/kickc/src/main/java/dk/camelot64/kickc/parser\KickC.g4 by ANTLR 4.7
package dk.camelot64.kickc.parser;
import org.antlr.v4.runtime.Lexer;
import org.antlr.v4.runtime.CharStream;

24
src/main/java/dk/camelot64/kickc/parser/KickCListener.java
View File

@ -1,4 +1,4 @@
// Generated from /Users/jespergravgaard/c64/kickc/src/main/java/dk/camelot64/kickc/parser/KickC.g4 by ANTLR 4.7
// Generated from C:/c64/kickc/src/main/java/dk/camelot64/kickc/parser\KickC.g4 by ANTLR 4.7
package dk.camelot64.kickc.parser;
import org.antlr.v4.runtime.tree.ParseTreeListener;
@ -108,15 +108,29 @@ public interface KickCListener extends ParseTreeListener {
*/
void exitDeclVariableList(KickCParser.DeclVariableListContext ctx);
/**
* Enter a parse tree produced by {@link KickCParser#declVariableInit}.
* Enter a parse tree produced by the {@code declVariableInitExpr}
* labeled alternative in {@link KickCParser#declVariableInit}.
* @param ctx the parse tree
*/
void enterDeclVariableInit(KickCParser.DeclVariableInitContext ctx);
void enterDeclVariableInitExpr(KickCParser.DeclVariableInitExprContext ctx);
/**
* Exit a parse tree produced by {@link KickCParser#declVariableInit}.
* Exit a parse tree produced by the {@code declVariableInitExpr}
* labeled alternative in {@link KickCParser#declVariableInit}.
* @param ctx the parse tree
*/
void exitDeclVariableInit(KickCParser.DeclVariableInitContext ctx);
void exitDeclVariableInitExpr(KickCParser.DeclVariableInitExprContext ctx);
/**
* Enter a parse tree produced by the {@code declVariableInitKasm}
* labeled alternative in {@link KickCParser#declVariableInit}.
* @param ctx the parse tree
*/
void enterDeclVariableInitKasm(KickCParser.DeclVariableInitKasmContext ctx);
/**
* Exit a parse tree produced by the {@code declVariableInitKasm}
* labeled alternative in {@link KickCParser#declVariableInit}.
* @param ctx the parse tree
*/
void exitDeclVariableInitKasm(KickCParser.DeclVariableInitKasmContext ctx);
/**
* Enter a parse tree produced by {@link KickCParser#declFunction}.
* @param ctx the parse tree

1476
src/main/java/dk/camelot64/kickc/parser/KickCParser.java
View File

File diff suppressed because it is too large Load Diff

14
src/main/java/dk/camelot64/kickc/parser/KickCVisitor.java
View File

@ -1,4 +1,4 @@
// Generated from /Users/jespergravgaard/c64/kickc/src/main/java/dk/camelot64/kickc/parser/KickC.g4 by ANTLR 4.7
// Generated from C:/c64/kickc/src/main/java/dk/camelot64/kickc/parser\KickC.g4 by ANTLR 4.7
package dk.camelot64.kickc.parser;
import org.antlr.v4.runtime.tree.ParseTreeVisitor;
@ -71,11 +71,19 @@ public interface KickCVisitor<T> extends ParseTreeVisitor<T> {
*/
T visitDeclVariableList(KickCParser.DeclVariableListContext ctx);
/**
* Visit a parse tree produced by {@link KickCParser#declVariableInit}.
* Visit a parse tree produced by the {@code declVariableInitExpr}
* labeled alternative in {@link KickCParser#declVariableInit}.
* @param ctx the parse tree
* @return the visitor result
*/
T visitDeclVariableInit(KickCParser.DeclVariableInitContext ctx);
T visitDeclVariableInitExpr(KickCParser.DeclVariableInitExprContext ctx);
/**
* Visit a parse tree produced by the {@code declVariableInitKasm}
* labeled alternative in {@link KickCParser#declVariableInit}.
* @param ctx the parse tree
* @return the visitor result
*/
T visitDeclVariableInitKasm(KickCParser.DeclVariableInitKasmContext ctx);
/**
* Visit a parse tree produced by {@link KickCParser#declFunction}.
* @param ctx the parse tree

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

@ -4,6 +4,7 @@ import dk.camelot64.kickc.Compiler;
import dk.camelot64.kickc.NumberParser;
import dk.camelot64.kickc.asm.AsmClobber;
import dk.camelot64.kickc.model.*;
import dk.camelot64.kickc.model.InternalError;
import dk.camelot64.kickc.model.operators.*;
import dk.camelot64.kickc.model.statements.*;
import dk.camelot64.kickc.model.symbols.*;
@ -496,28 +497,11 @@ public class Pass0GenerateStatementSequence extends KickCBaseVisitor<Object> {
}
@Override
public Object visitDeclVariableInit(KickCParser.DeclVariableInitContext ctx) {
List<Directive> directives = declVarDirectives;
public Object visitDeclVariableInitExpr(KickCParser.DeclVariableInitExprContext ctx) {
String varName = ctx.NAME().getText();
VariableUnversioned lValue = visitDeclVariableInit(varName, ctx);
SymbolType type = declVarType;
List<Comment> comments = declVarComments;
String varName = ctx.NAME().getText();
VariableUnversioned lValue;
try {
lValue = getCurrentScope().addVariable(varName, type);
} catch(CompileError e) {
throw new CompileError(e.getMessage(), new StatementSource(ctx));
}
// Add directives
addDirectives(lValue, type, directives, new StatementSource(ctx));
// Array / String variables are implicitly constant
if(type instanceof SymbolTypeArray || type.equals(SymbolType.STRING)) {
lValue.setDeclaredConstant(true);
}
if(lValue.isDeclaredConstant()) {
// Add comments to constant
lValue.setComments(ensureUnusedComments(comments));
}
KickCParser.ExprContext initializer = ctx.expr();
if(declVarStructMember || declVarTypeDef) {
if(initializer != null) {
@ -537,15 +521,44 @@ public class Pass0GenerateStatementSequence extends KickCBaseVisitor<Object> {
return null;
}
@Override
public Object visitDeclVariableInitKasm(KickCParser.DeclVariableInitKasmContext ctx) {
throw new InternalError("Not implemented");
}
private VariableUnversioned visitDeclVariableInit(String varName, KickCParser.DeclVariableInitContext ctx) {
List<Directive> directives = declVarDirectives;
SymbolType type = declVarType;
List<Comment> comments = declVarComments;
VariableUnversioned lValue;
try {
lValue = getCurrentScope().addVariable(varName, type);
} catch(CompileError e) {
throw new CompileError(e.getMessage(), new StatementSource(ctx));
}
// Add directives
addDirectives(lValue, type, directives, new StatementSource(ctx));
// Array / String variables are implicitly constant
if(type instanceof SymbolTypeArray || type.equals(SymbolType.STRING)) {
lValue.setDeclaredConstant(true);
}
if(lValue.isDeclaredConstant()) {
// Add comments to constant
lValue.setComments(ensureUnusedComments(comments));
}
return lValue;
}
/**
* Create a statement that initializes a variable with the default (zero) value. The statement has to be added to the program by the caller.
* @param lValue The variable to initialize
* @param varRef The variable to initialize
* @param type The type of the variable
* @param statementSource The source line
* @param comments Any comments to add to the output
* @return The new statement
*/
public static Statement createDefaultInitializationStatement(VariableRef varRef, SymbolType type, StatementSource statementSource, List<Comment> comments) {
static Statement createDefaultInitializationStatement(VariableRef varRef, SymbolType type, StatementSource statementSource, List<Comment> comments) {
Statement initStmt;
if(type instanceof SymbolTypeIntegerFixed) {
// Add an zero value initializer