glm94/assm-test
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated the Parser to try and give 'AddressParameter's more meaning depending on the SymbolType.

Browse Source
This commit is contained in:
glm94
2022-10-08 18:21:11 -05:00
parent 48a77950be
commit fd44e03b1b
4 changed files with 48 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.c
+22 -2
View File
@@ -109,7 +109,17 @@ int main(int argc, char* args[]) {
break;
case AddressParameter:
if (ins->ParameterOne->InterpretedAs == AddressParameter) printf("[%s]", ins->ParameterOne->Value.Symbol);
else printf("%s", ins->ParameterOne->Value.Symbol);
else {
Symbol* s = TryGetSymbol(ins->ParameterOne->Value.Symbol, image->SymbolsTable);
switch(s->Type) {
case NumericSymbol:
printf("%s {%d}", s->Name, s->Value.Number);
break;
default:
printf("%s", ins->ParameterOne->Value.Symbol);
}
}
break;
default:
printf("\n");
@@ -133,7 +143,17 @@ int main(int argc, char* args[]) {
break;
case AddressParameter:
if (ins->ParameterTwo->InterpretedAs == AddressParameter) printf(", [%s]\n", ins->ParameterTwo->Value.Symbol);
else printf(", %s\n", ins->ParameterTwo->Value.Symbol);
else {
Symbol* s = TryGetSymbol(ins->ParameterTwo->Value.Symbol, image->SymbolsTable);
switch(s->Type) {
case NumericSymbol:
printf(", %s {%d}\n", s->Name, s->Value.Number);
break;
default:
printf(", %s\n", ins->ParameterTwo->Value.Symbol);
}
}
break;
default:
printf("\n");
src/parser.c
+21 -4
View File
@@ -148,11 +148,28 @@ Parameter* GetParameterType() {
//case LabelClass:
case IdentifierClass:
param->ParameterType = AddressParameter;
param->InterpretedAs = AddressParameter;
//param->InterpretedAs = AddressParameter;
symbol = TryGetSymbol(token->Lemexe, MachineState.SymbolsTable);
if (!symbol) symbol = AddSymbolToTable(token->Lemexe, UnresolvedSymbol, MachineState.SymbolsTable);
if (!symbol) {
symbol = AddSymbolToTable(token->Lemexe, UnresolvedSymbol, MachineState.SymbolsTable);
param->InterpretedAs = UnresolvedParameter;
}
else {
switch(symbol->Type) {
case InstructionPointerSymbol:
case StringSymbol:
param->InterpretedAs = AddressParameter;
break;
case NumericSymbol:
param->InterpretedAs = ConstantParameter;
break;
default:
param->InterpretedAs = UnresolvedParameter;
break;
}
}
param->Value.Symbol = symbol->Name;
@@ -298,9 +315,9 @@ void PrintSymbols(void) {
break;
case StringSymbol:
if (symbol->Value.String->Terminated)
printf("[S] %s, %d", symbol->Name, symbol->Value.String->TerminatingByte);
printf("[S] %s {%s}, %d", symbol->Name, symbol->Value.String->String, symbol->Value.String->TerminatingByte);
else
printf("[S] %s", symbol->Value.String->String);
printf("[S] %s {%s}", symbol->Name, symbol->Value.String->String);
break;
case UnresolvedSymbol:
printf("[U] %s", symbol->Name);