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

Fix redeclaration of variable in execute w/ S

Browse Source
This commit is contained in:
Themis Demetriades 2024-06-03 20:40:05 +01:00
parent 20557a14eb
commit 5afcb8ef63
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/execute.c
View File

@ -92,30 +92,30 @@ static void executeDPImmediate(Machine *state, a64inst_instruction *inst) {
case a64inst_DPI_ARITHM:; case a64inst_DPI_ARITHM:;
// If shift flag is enabled, logical left shift by the number of bits specified by the architecture // If shift flag is enabled, logical left shift by the number of bits specified by the architecture
dword immediate = inst->data.DPImmediateData.processOpData.arithmData.immediate; dword arithmImm = inst->data.DPImmediateData.processOpData.arithmData.immediate;
dword srcVal = state->registers[inst->data.DPImmediateData.processOpData.arithmData.src]; dword srcVal = state->registers[inst->data.DPImmediateData.processOpData.arithmData.src];
if (inst->data.DPImmediateData.processOpData.arithmData.shiftImmediate) { if (inst->data.DPImmediateData.processOpData.arithmData.shiftImmediate) {
immediate = truncateValue(immediate << DPI_ARITHM_SHIFT, regType); arithmImm = truncateValue(arithmImm << DPI_ARITHM_SHIFT, regType);
} }
switch(inst->data.DPImmediateData.processOp) { switch(inst->data.DPImmediateData.processOp) {
dword result; dword result;
case(a64inst_ADDS): case(a64inst_ADDS):
result = srcVal + immediate; result = srcVal + arithmImm;
writeRegister(state, dest, regType, result); writeRegister(state, dest, regType, result);
updateCondNZ(state, result, regType); updateCondNZ(state, result, regType);
state->conditionCodes.Overflow = max(srcVal, immediate) > result; state->conditionCodes.Overflow = max(srcVal, arithmImm) > result;
state->conditionCodes.Carry = state->conditionCodes.Overflow; state->conditionCodes.Carry = state->conditionCodes.Overflow;
break; break;
case(a64inst_ADD): case(a64inst_ADD):
writeRegister(state, dest, regType, srcVal + immediate); writeRegister(state, dest, regType, srcVal + arithmImm);
break; break;
case(a64inst_SUBS): case(a64inst_SUBS):
result = srcVal - immediate; result = srcVal - arithmImm;
writeRegister(state, dest, regType, result); writeRegister(state, dest, regType, result);
updateCondNZ(state, result, regType); updateCondNZ(state, result, regType);
@ -124,7 +124,7 @@ static void executeDPImmediate(Machine *state, a64inst_instruction *inst) {
break; break;
case(a64inst_SUB): case(a64inst_SUB):
writeRegister(state, dest, regType, srcVal - immediate); writeRegister(state, dest, regType, srcVal - arithmImm);
break; break;
// Unknown opcode detected! // Unknown opcode detected!
@ -137,23 +137,23 @@ static void executeDPImmediate(Machine *state, a64inst_instruction *inst) {
// Execute a wide move data processing instruction // Execute a wide move data processing instruction
case a64inst_DPI_WIDEMOV:; case a64inst_DPI_WIDEMOV:;
uint8_t shiftScalar = inst->data.DPImmediateData.processOpData.wideMovData.shiftScalar; uint8_t shiftScalar = inst->data.DPImmediateData.processOpData.wideMovData.shiftScalar;
uint16_t immediate = inst->data.DPImmediateData.processOpData.wideMovData.immediate; uint16_t wideMovImm = inst->data.DPImmediateData.processOpData.wideMovData.immediate;
// NOTE: Not checking that shiftScalar has valid value for 32bit registers. Possibly add explicit error. // NOTE: Not checking that shiftScalar has valid value for 32bit registers. Possibly add explicit error.
immediate = truncateValue(shiftScalar * DPI_WIDEMOV_SHIFT, regType); wideMovImm = truncateValue(shiftScalar * DPI_WIDEMOV_SHIFT, regType);
switch(inst->data.DPImmediateData.processOp) { switch(inst->data.DPImmediateData.processOp) {
case(a64inst_MOVN): case(a64inst_MOVN):
writeRegister(state, dest, regType, ~immediate); writeRegister(state, dest, regType, ~wideMovImm);
break; break;
case(a64inst_MOVZ): case(a64inst_MOVZ):
writeRegister(state, dest, regType, immediate); writeRegister(state, dest, regType, wideMovImm);
break; break;
case(a64inst_MOVK):; case(a64inst_MOVK):;
dword result = readRegister(state, dest, regType); dword result = readRegister(state, dest, regType);
result = (result & ~(((1 << DPI_WIDEMOV_SHIFT) - 1) << shiftScalar)) | immediate; result = (result & ~(((1 << DPI_WIDEMOV_SHIFT) - 1) << shiftScalar)) | wideMovImm;
writeRegister(state, dest, regType, result); writeRegister(state, dest, regType, result);
break; break;