Skip to content

Commit

Permalink
disasm-aarch32: Handle disassembly of AES instructions
Browse files Browse the repository at this point in the history
  • Loading branch information
@lioncash
lioncash committed Jan 26, 2022
1 parent a850162 commit 769236c
Show file tree
Hide file tree
Showing 2 changed files with 144 additions and 12 deletions.
148 changes: 136 additions & 12 deletions src/aarch32/disasm-aarch32.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1228,6 +1228,42 @@ void Disassembler::and_(Condition cond,
os() << rn << ", " << operand;
}

void Disassembler::aesd(Condition cond,
DataType dt,
QRegister rd,
QRegister rm) {
os().SetCurrentInstruction(kAesd, kNoAttribute);
os() << ToCString(kAesd) << ConditionPrinter(it_block_, cond)
<< DtPrinter(dt, Untyped8) << ' ' << rd << ", " << rm;
}

void Disassembler::aese(Condition cond,
DataType dt,
QRegister rd,
QRegister rm) {
os().SetCurrentInstruction(kAese, kNoAttribute);
os() << ToCString(kAese) << ConditionPrinter(it_block_, cond)
<< DtPrinter(dt, Untyped8) << ' ' << rd << ", " << rm;
}

void Disassembler::aesimc(Condition cond,
DataType dt,
QRegister rd,
QRegister rm) {
os().SetCurrentInstruction(kAesimc, kNoAttribute);
os() << ToCString(kAesimc) << ConditionPrinter(it_block_, cond)
<< DtPrinter(dt, Untyped8) << ' ' << rd << ", " << rm;
}

void Disassembler::aesmc(Condition cond,
DataType dt,
QRegister rd,
QRegister rm) {
os().SetCurrentInstruction(kAesmc, kNoAttribute);
os() << ToCString(kAesmc) << ConditionPrinter(it_block_, cond)
<< DtPrinter(dt, Untyped8) << ' ' << rd << ", " << rm;
}

void Disassembler::ands(Condition cond,
EncodingSize size,
Register rd,
Expand Down Expand Up @@ -26583,14 +26619,38 @@ void Disassembler::DecodeT32(uint32_t instr) {
switch (instr & 0x00000080) {
case 0x00000000: {
// 0xffb00300
UnimplementedT32_32("AESE",
instr);
unsigned rd =
ExtractQRegister(instr,
22,
12);
unsigned rm =
ExtractQRegister(instr, 5, 0);
if (((instr >> 18) & 0x3) != 0) {
UnallocatedT32(instr);
return;
}
aese(CurrentCond(),
Untyped8,
QRegister(rd),
QRegister(rm));
break;
}
case 0x00000080: {
// 0xffb00380
UnimplementedT32_32("AESMC",
instr);
unsigned rd =
ExtractQRegister(instr,
22,
12);
unsigned rm =
ExtractQRegister(instr, 5, 0);
if (((instr >> 18) & 0x3) != 0) {
UnallocatedT32(instr);
return;
}
aesmc(CurrentCond(),
Untyped8,
QRegister(rd),
QRegister(rm));
break;
}
}
Expand All @@ -26601,14 +26661,38 @@ void Disassembler::DecodeT32(uint32_t instr) {
switch (instr & 0x00000080) {
case 0x00000000: {
// 0xffb00340
UnimplementedT32_32("AESD",
instr);
unsigned rd =
ExtractQRegister(instr,
22,
12);
unsigned rm =
ExtractQRegister(instr, 5, 0);
if (((instr >> 18) & 0x3) != 0) {
UnallocatedT32(instr);
return;
}
aesd(CurrentCond(),
Untyped8,
QRegister(rd),
QRegister(rm));
break;
}
case 0x00000080: {
// 0xffb003c0
UnimplementedT32_32("AESIMC",
instr);
unsigned rd =
ExtractQRegister(instr,
22,
12);
unsigned rm =
ExtractQRegister(instr, 5, 0);
if (((instr >> 18) & 0x3) != 0) {
UnallocatedT32(instr);
return;
}
aesimc(CurrentCond(),
Untyped8,
QRegister(rd),
QRegister(rm));
break;
}
}
Expand Down Expand Up @@ -41045,12 +41129,32 @@ void Disassembler::DecodeA32(uint32_t instr) {
switch (instr & 0x00000080) {
case 0x00000000: {
// 0xf3b00300
UnimplementedA32("AESE", instr);
unsigned rd =
ExtractQRegister(instr, 22, 12);
unsigned rm = ExtractQRegister(instr, 5, 0);
if (((instr >> 18) & 0x3) != 0) {
UnallocatedA32(instr);
return;
}
aese(CurrentCond(),
Untyped8,
QRegister(rd),
QRegister(rm));
break;
}
case 0x00000080: {
// 0xf3b00380
UnimplementedA32("AESMC", instr);
unsigned rd =
ExtractQRegister(instr, 22, 12);
unsigned rm = ExtractQRegister(instr, 5, 0);
if (((instr >> 18) & 0x3) != 0) {
UnallocatedA32(instr);
return;
}
aesmc(CurrentCond(),
Untyped8,
QRegister(rd),
QRegister(rm));
break;
}
}
Expand All @@ -41061,12 +41165,32 @@ void Disassembler::DecodeA32(uint32_t instr) {
switch (instr & 0x00000080) {
case 0x00000000: {
// 0xf3b00340
UnimplementedA32("AESD", instr);
unsigned rd =
ExtractQRegister(instr, 22, 12);
unsigned rm = ExtractQRegister(instr, 5, 0);
if (((instr >> 18) & 0x3) != 0) {
UnallocatedA32(instr);
return;
}
aesd(CurrentCond(),
Untyped8,
QRegister(rd),
QRegister(rm));
break;
}
case 0x00000080: {
// 0xf3b003c0
UnimplementedA32("AESIMC", instr);
unsigned rd =
ExtractQRegister(instr, 22, 12);
unsigned rm = ExtractQRegister(instr, 5, 0);
if (((instr >> 18) & 0x3) != 0) {
UnallocatedA32(instr);
return;
}
aesimc(CurrentCond(),
Untyped8,
QRegister(rd),
QRegister(rm));
break;
}
}
Expand Down
8 changes: 8 additions & 0 deletions src/aarch32/disasm-aarch32.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -639,6 +639,14 @@ class Disassembler {

void adr(Condition cond, EncodingSize size, Register rd, Location* location);

void aesd(Condition cond, DataType dt, QRegister rd, QRegister rm);

void aese(Condition cond, DataType dt, QRegister rd, QRegister rm);

void aesimc(Condition cond, DataType dt, QRegister rd, QRegister rm);

void aesmc(Condition cond, DataType dt, QRegister rd, QRegister rm);

void and_(Condition cond,
EncodingSize size,
Register rd,
Expand Down

0 comments on commit 769236c

Please sign in to comment.