krgamestudios/Toy
1
0
Fork 0
mirror of https://github.com/krgamestudios/Toy.git synced 2026-04-15 23:04:08 +10:00
Code Issues Packages Projects Releases Wiki Activity

Simplified an optimisation

Browse Source
This commit is contained in:
Kayne Ruse
2022-11-27 02:25:33 +00:00
parent eb26d23363
commit 70698a4a1a
3 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/compiler.c
View File

@@ -18,7 +18,7 @@ void initCompiler(Compiler* compiler) {
} }
//separated out, so it can be recursive //separated out, so it can be recursive
static int writeLiteralTypeToCacheOpt(LiteralArray* literalCache, Literal literal, bool skipDuplicationOptimisation) { static int writeLiteralTypeToCache(LiteralArray* literalCache, Literal literal) {
bool shouldFree = false; bool shouldFree = false;
//if it's a compound type, recurse and store the results //if it's a compound type, recurse and store the results
@@ -32,7 +32,7 @@ static int writeLiteralTypeToCacheOpt(LiteralArray* literalCache, Literal litera
for (int i = 0; i < AS_TYPE(literal).count; i++) { for (int i = 0; i < AS_TYPE(literal).count; i++) {
//write the values to the cache, and the indexes to the store //write the values to the cache, and the indexes to the store
int subIndex = writeLiteralTypeToCacheOpt(literalCache, ((Literal*)(AS_TYPE(literal).subtypes))[i], false); int subIndex = writeLiteralTypeToCache(literalCache, ((Literal*)(AS_TYPE(literal).subtypes))[i]);
Literal lit = TO_INTEGER_LITERAL(subIndex); Literal lit = TO_INTEGER_LITERAL(subIndex);
pushLiteralArray(store, lit); pushLiteralArray(store, lit);
@@ -45,8 +45,7 @@ static int writeLiteralTypeToCacheOpt(LiteralArray* literalCache, Literal litera
literal.type = LITERAL_TYPE_INTERMEDIATE; //NOTE: tweaking the type usually isn't a good idea literal.type = LITERAL_TYPE_INTERMEDIATE; //NOTE: tweaking the type usually isn't a good idea
} }
if (!skipDuplicationOptimisation) { //optimisation: check if exactly this literal array exists
//BUGFIX: check if exactly this literal array exists
int index = findLiteralIndex(literalCache, literal); int index = findLiteralIndex(literalCache, literal);
if (index < 0) { if (index < 0) {
index = pushLiteralArray(literalCache, literal); index = pushLiteralArray(literalCache, literal);
@@ -56,18 +55,6 @@ static int writeLiteralTypeToCacheOpt(LiteralArray* literalCache, Literal litera
freeLiteral(literal); freeLiteral(literal);
} }
return index; return index;
}
else {
int index = pushLiteralArray(literalCache, literal);
if (shouldFree) {
freeLiteral(literal);
}
return index;
}
}
static int writeLiteralTypeToCache(LiteralArray* literalCache, Literal literal) {
return writeLiteralTypeToCacheOpt(literalCache, literal, false);
} }
static int writeNodeCompoundToCache(Compiler* compiler, ASTNode* node) { static int writeNodeCompoundToCache(Compiler* compiler, ASTNode* node) {
@@ -200,7 +187,7 @@ static int writeNodeCollectionToCache(Compiler* compiler, ASTNode* node) {
case AST_NODE_VAR_DECL: { case AST_NODE_VAR_DECL: {
//write each piece of the declaration to the cache //write each piece of the declaration to the cache
int identifierIndex = pushLiteralArray(&compiler->literalCache, node->fnCollection.nodes[i].varDecl.identifier); //store without duplication optimisation int identifierIndex = pushLiteralArray(&compiler->literalCache, node->fnCollection.nodes[i].varDecl.identifier); //store without duplication optimisation
int typeIndex = writeLiteralTypeToCacheOpt(&compiler->literalCache, node->fnCollection.nodes[i].varDecl.typeLiteral, false); int typeIndex = writeLiteralTypeToCache(&compiler->literalCache, node->fnCollection.nodes[i].varDecl.typeLiteral);
Literal identifierLiteral = TO_INTEGER_LITERAL(identifierIndex); Literal identifierLiteral = TO_INTEGER_LITERAL(identifierIndex);
pushLiteralArray(store, identifierLiteral); pushLiteralArray(store, identifierLiteral);
@@ -214,7 +201,7 @@ static int writeNodeCollectionToCache(Compiler* compiler, ASTNode* node) {
case AST_NODE_LITERAL: { case AST_NODE_LITERAL: {
//write each piece of the declaration to the cache //write each piece of the declaration to the cache
int typeIndex = writeLiteralTypeToCacheOpt(&compiler->literalCache, node->fnCollection.nodes[i].atomic.literal, false); int typeIndex = writeLiteralTypeToCache(&compiler->literalCache, node->fnCollection.nodes[i].atomic.literal);
Literal typeLiteral = TO_INTEGER_LITERAL(typeIndex); Literal typeLiteral = TO_INTEGER_LITERAL(typeIndex);
pushLiteralArray(store, typeLiteral); pushLiteralArray(store, typeLiteral);

4
source/parser.c
View File

@@ -418,7 +418,7 @@ static Opcode unary(Parser* parser, ASTNode** nodeHandle) {
//temp handle to potentially negate values //temp handle to potentially negate values
parsePrecedence(parser, &tmpNode, PREC_TERNARY); //can be a literal parsePrecedence(parser, &tmpNode, PREC_TERNARY); //can be a literal
//check for negative literals (optimisation) //optimisation: check for negative literals
if (tmpNode->type == AST_NODE_LITERAL && (IS_INTEGER(tmpNode->atomic.literal) || IS_FLOAT(tmpNode->atomic.literal))) { if (tmpNode->type == AST_NODE_LITERAL && (IS_INTEGER(tmpNode->atomic.literal) || IS_FLOAT(tmpNode->atomic.literal))) {
//negate directly, if int or float //negate directly, if int or float
Literal lit = tmpNode->atomic.literal; Literal lit = tmpNode->atomic.literal;
@@ -888,7 +888,7 @@ ParseRule* getRule(TokenType type) {
return &parseRules[type]; return &parseRules[type];
} }
//constant folding (optimisation) //optimisation: constant folding
static bool calcStaticBinaryArithmetic(Parser* parser, ASTNode** nodeHandle) { static bool calcStaticBinaryArithmetic(Parser* parser, ASTNode** nodeHandle) {
switch((*nodeHandle)->binary.opcode) { switch((*nodeHandle)->binary.opcode) {
case OP_ADDITION: case OP_ADDITION:

2
source/toy_common.h
View File

@@ -6,7 +6,7 @@
#define TOY_VERSION_MAJOR 0 #define TOY_VERSION_MAJOR 0
#define TOY_VERSION_MINOR 6 #define TOY_VERSION_MINOR 6
#define TOY_VERSION_PATCH 4 #define TOY_VERSION_PATCH 5
#define TOY_VERSION_BUILD __DATE__ " " __TIME__ #define TOY_VERSION_BUILD __DATE__ " " __TIME__
//platform exports/imports //platform exports/imports