fallout2sfall/sslc
0
0
Fork 0
mirror of https://github.com/sfall-team/sslc.git synced 2026-07-27 16:52:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Stringspace compression: Fix procedure stringified names shifting on every use when

Browse Source
This commit is contained in:
phobos2077
2024-06-09 12:01:31 +02:00
parent f14ec78c81
commit 500cd103b2
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
optimize.c
+11 -6
View File
@@ -1217,13 +1217,10 @@ static void CompressNamelist(Program *prog) {
FreeNamelistData(refs, offsets, transforms); FreeNamelistData(refs, offsets, transforms);
} }
static int* GetStringReference(Node *node, Program *prog) { static int* GetStringOffsetRef(Node *node, Program *prog) {
if (node->token == T_CONSTANT && node->value.type == V_STRING) { if (node->token == T_CONSTANT && node->value.type == V_STRING) {
return &node->value.stringData; return &node->value.stringData;
} }
else if (node->token == T_SYMBOL && node->value.type & P_STRINGIFY) {
return &prog->procedures.procedures[node->value.intData].stringifiedName;
}
return 0; return 0;
} }
@@ -1254,7 +1251,7 @@ static void CompressStringspace(Program *prog) {
proc = &prog->procedures.procedures[i]; proc = &prog->procedures.procedures[i];
for (k = 0; k < proc->nodes.numNodes; k++) { for (k = 0; k < proc->nodes.numNodes; k++) {
node = &proc->nodes.nodes[k]; node = &proc->nodes.nodes[k];
if (stringData = GetStringReference(node, prog)) { if (stringData = GetStringOffsetRef(node, prog)) {
SetNameReferenced(*stringData, entries, refs, offsets, 1); SetNameReferenced(*stringData, entries, refs, offsets, 1);
} }
} }
@@ -1268,6 +1265,10 @@ static void CompressStringspace(Program *prog) {
for (i = 0; i < prog->variables.numVariables; i++) { for (i = 0; i < prog->variables.numVariables; i++) {
SetVariableDefaultValueReferenced(&prog->variables.variables[i], entries, refs, offsets, 8); SetVariableDefaultValueReferenced(&prog->variables.variables[i], entries, refs, offsets, 8);
} }
//Handle stringified names
for (i = 0; i < prog->procedures.numProcedures; i++) {
SetNameReferenced(prog->procedures.procedures[i].stringifiedName, entries, refs, offsets, 16);
}
//For each string that isn't referenced, remove it //For each string that isn't referenced, remove it
for (i = entries - 1; i >= 0; i--) { for (i = entries - 1; i >= 0; i--) {
if (!refs[i]) { if (!refs[i]) {
@@ -1279,7 +1280,7 @@ static void CompressStringspace(Program *prog) {
proc = &prog->procedures.procedures[i]; proc = &prog->procedures.procedures[i];
for (k = 0; k < proc->nodes.numNodes; k++) { for (k = 0; k < proc->nodes.numNodes; k++) {
node = &proc->nodes.nodes[k]; node = &proc->nodes.nodes[k];
if (stringData = GetStringReference(node, prog)) { if (stringData = GetStringOffsetRef(node, prog)) {
ShiftName(stringData, entries, transforms, offsets); ShiftName(stringData, entries, transforms, offsets);
} }
} }
@@ -1293,6 +1294,10 @@ static void CompressStringspace(Program *prog) {
for (i = 0; i < prog->variables.numVariables; i++) { for (i = 0; i < prog->variables.numVariables; i++) {
ShiftVariableDefaultValue(&prog->variables.variables[i], entries, transforms, offsets); ShiftVariableDefaultValue(&prog->variables.variables[i], entries, transforms, offsets);
} }
//Handle stringified names
for (i = 0; i < prog->procedures.numProcedures; i++) {
ShiftName(&prog->procedures.procedures[i].stringifiedName, entries, transforms, offsets);
}
FreeNamelistData(refs, offsets, transforms); FreeNamelistData(refs, offsets, transforms);
} }