sBubshait/ARMv8
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'assembler-e' into 'assembler'

Browse Source 
fix use of cpp syntax

See merge request lab2324_summer/armv8_43!5
This commit is contained in:
Dias Alberto, Ethan 2024-06-06 16:11:03 +00:00
commit 5190f2489c
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/parser.c
View File

@ -84,8 +84,13 @@ void generateBranchOperands(a64inst_instruction *instr, char* opcode, char *oper
} }
void classifyOpcode(char* opcode, a64inst_instruction *instr, char *operandList[]){ void classifyOpcode(char* opcode, a64inst_instruction *instr, char *operandList[]){
if((int isUnconditional = strcmp(opcode, "b")) == 0 || int isUnconditional = strcmp(opcode, "b");
(int isRegister = strcmp(opcode, "br")) == 0 || int isRegister = strcmp(opcode, "br");
int isLoad = strcmp(opcode, "ldr");
int isStore = strcmp(opcode, "str");
if(isUnconditional == 0 ||
isRegister == 0 ||
strncmp(opcode, "b.", 2) == 0){ strncmp(opcode, "b.", 2) == 0){
instr->type = a64inst_BRANCH; instr->type = a64inst_BRANCH;
if(isUnconditional){ if(isUnconditional){
@ -97,7 +102,7 @@ void classifyOpcode(char* opcode, a64inst_instruction *instr, char *operandList[
//instr->data.branchData.processOpData.cond = {remove first two chars of opcode} //instr->data.branchData.processOpData.cond = {remove first two chars of opcode}
} }
generateBranchOperands(instr, opcode, operandList); generateBranchOperands(instr, opcode, operandList);
} else if((int isLoad = strcmp(opcode, "ldr")) == 0 || (int isStore = strcmp(opcode, "str")) == 0){ } else if(isLoad == 0 || isStore == 0){
//loading/storing instruction; classify operands //loading/storing instruction; classify operands
char *address = operandList[1]; char *address = operandList[1];
if( *address == '['){ if( *address == '['){