Skip to content

[ARM] Remove LDM leftover code #2115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kabeor merged 4 commits into from
Jul 23, 2023
Merged

[ARM] Remove LDM leftover code #2115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ecb6c9a
Remove leftover code.
Rot127 Jul 22, 2023
6cd586b
Remove leading space
Rot127 Jul 22, 2023
03bf3f5
Fix detail of T2AddrModeSoReg operands.
Rot127 Jul 22, 2023
9590978
Fix AddrMode3Operand_1
Rot127 Jul 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions arch/ARM/ARMInstPrinter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,25 +260,17 @@ static void printInst(MCInst *MI, SStream *O, void *info)
Writeback = false;
}

SStream_concat0(O, " ldm");
SStream_concat0(O, "ldm");

printPredicateOperand(MI, 1, O);
SStream_concat0(O, " ");

printOperand(MI, 0, O);
if (Writeback) {
SStream_concat0(O, "!");
// TODO: Do this in a static function called by ARMMapping.c::ARM_printer().
if (MI->flat_insn->detail) {
ARM_get_detail_op(MI, -1)->access |=
CS_AC_WRITE;
MI->flat_insn->detail->writeback = true;
}
}
SStream_concat0(O, ", ");
printRegisterList(MI, 3, O);
// TODO: Do this in a static function called by ARMMapping.c::ARM_printer().
MI->flat_insn->id = ARM_INS_VPOP;
return;
}

Expand Down
12 changes: 6 additions & 6 deletions arch/ARM/ARMMapping.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1322,10 +1322,10 @@ static void add_cs_detail_general(MCInst *MI, arm_op_group op_group,
MCInst_getOpVal(MI, OpNum));
ARM_set_detail_op_mem(MI, OpNum + 1, true, 0, 0,
MCInst_getOpVal(MI, OpNum + 1));
unsigned ShAmt = MCInst_getOpVal(MI, OpNum);
unsigned ShAmt = MCInst_getOpVal(MI, OpNum + 2);
if (ShAmt) {
ARM_get_detail_op(MI, 2)->shift.type = ARM_SFT_LSL;
ARM_get_detail_op(MI, 2)->shift.value = ShAmt;
ARM_get_detail_op(MI, 0)->shift.type = ARM_SFT_LSL;
ARM_get_detail_op(MI, 0)->shift.value = ShAmt;
}
ARM_set_mem_access(MI, false);
break;
Expand Down Expand Up @@ -1536,12 +1536,12 @@ static void add_cs_detail_template_1(MCInst *MI, arm_op_group op_group,
ARM_set_mem_access(MI, false);
break;
}
unsigned ImmOffs = ARM_AM_getAM3Offset(
MCOperand_getImm(MCInst_getOperand(MI, OpNum + 2)));
unsigned ImmOffs =
ARM_AM_getAM3Offset(MCInst_getOpVal(MI, OpNum + 2));

if (AlwaysPrintImm0 || ImmOffs || Sign == ARM_AM_sub) {
ARM_set_detail_op_mem(MI, OpNum + 2, false, 0, 0,
MCInst_getOpVal(MI, OpNum + 2));
ImmOffs);
ARM_get_detail_op(MI, 0)->subtracted = Sign ==
ARM_AM_sub;
}
Expand Down