Skip to content
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

Jump to bottom

Hotfix for -DCAPSTONE_DIET build. #2038

Merged
merged 1 commit into from
May 31, 2023
Merged

Hotfix for -DCAPSTONE_DIET build. #2038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion arch/AArch64/AArch64GenAsmWriter.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ static uint64_t getMnemonic(MCInst *MI, SStream *O, unsigned int opcode) {
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Woverlength-strings"
#endif

#ifndef CAPSTONE_DIET
static const char AsmStrs[] = {
/* 0 */ "sha1su0\t\0"
Expand Down Expand Up @@ -1131,6 +1132,8 @@ static uint64_t getMnemonic(MCInst *MI, SStream *O, unsigned int opcode) {
/* 8739 */ "ld1w\t{\0"
/* 8746 */ "st1w\t{\0"
};
#endif

#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
Expand Down Expand Up @@ -7480,7 +7483,6 @@ static uint64_t getMnemonic(MCInst *MI, SStream *O, unsigned int opcode) {
138527510U, // anonymous_5384
138527511U, // anonymous_5385
};
#endif

static const uint32_t OpInfo1[] = {
0U, // PHI
Expand Down Expand Up @@ -13832,7 +13834,9 @@ static uint64_t getMnemonic(MCInst *MI, SStream *O, unsigned int opcode) {
uint64_t Bits = 0;
Bits |= (uint64_t)OpInfo0[opcode] << 0;
Bits |= (uint64_t)OpInfo1[opcode] << 32;
#ifndef CAPSTONE_DIET
SStream_concat0(O, AsmStrs+(Bits & 16383)-1);
#endif
return Bits;

}
Expand Down
4 changes: 4 additions & 0 deletions arch/AArch64/AArch64InstPrinter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2481,6 +2481,7 @@ static void printMatrixTileVector(MCInst *MI, unsigned OpNum, SStream *O, bool I
MCOperand *RegOp = MCInst_getOperand(MI, OpNum);
// assert(MCOperand_isReg(RegOp) && "Unexpected operand type!");
unsigned Reg = MCOperand_getReg(RegOp);
#ifndef CAPSTONE_DIET
const char *RegName = getRegisterName(Reg, AArch64_NoRegAltName);

const size_t strLn = strlen(RegName);
Expand All @@ -2499,6 +2500,7 @@ static void printMatrixTileVector(MCInst *MI, unsigned OpNum, SStream *O, bool I
}
}
SStream_concat0(O, RegNameNew);
#endif

if (MI->csh->detail) {
#ifndef CAPSTONE_DIET
Expand All @@ -2513,7 +2515,9 @@ static void printMatrixTileVector(MCInst *MI, unsigned OpNum, SStream *O, bool I
MI->flat_insn->detail->arm64.operands[MI->flat_insn->detail->arm64.op_count].reg = Reg;
MI->flat_insn->detail->arm64.op_count++;
}
#ifndef CAPSTONE_DIET
cs_mem_free(RegNameNew);
#endif
}

static const unsigned MatrixZADRegisterTable[] = {
Expand Down
2 changes: 2 additions & 0 deletions arch/PowerPC/PPCGenAsmWriter.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6135,7 +6135,9 @@ static void printInstruction(MCInst *MI, SStream *O)
uint64_t Bits = 0;
Bits |= (uint64_t)OpInfo0[opcode] << 0;
Bits |= (uint64_t)OpInfo1[opcode] << 32;
#ifndef CAPSTONE_DIET
SStream_concat0(O, AsmStrs+(Bits & 16383)-1);
#endif


// Fragment 0 encoded into 5 bits for 19 unique commands.
Expand Down