Skip to content

Commit

Permalink
fix and cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@trdthg
trdthg committed May 2, 2024
1 parent 0cc4473 commit 91667bb
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 57 deletions.
33 changes: 12 additions & 21 deletions src/machine/instruction.test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ void TestInstruction::instruction_access() {
QCOMPARE(i.address().get_raw(), (uint64_t)0x3ffffff);
}

static struct {
static const struct {
uint32_t code;
QString str;
QString alias_str = nullptr;
Expand All @@ -36,14 +36,14 @@ static struct {
{ 0b01111111111111111000111110010011, "addi x31, x31, 2047" },
{ 0b11111111111100001000000010010011, "addi x1, x1, -1" },
{ 0b10000000000000001000000010010011, "addi x1, x1, -2048" },
#include <./instruction.test.data.h>
#include <./instruction.test.data.def>
};

struct Pair {
uint32_t code;
QString str;
};
static struct {
static const struct {
QString string_data;
std::vector<Pair> pairs;
} pesude_code_to_string[] = {
Expand All @@ -70,8 +70,6 @@ void TestInstruction::instruction_to_str() {
for (size_t i = 0; i < sizeof(pesude_code_to_string) / sizeof(pesude_code_to_string[0]); i++) {
for (size_t j = 0; j < pesude_code_to_string[i].pairs.size(); j++) {
Pair pair = pesude_code_to_string[i].pairs[j];
uint32_t code;
Instruction::code_from_string(&code, pair.str.length(), pair.str, Address(0x0));
QCOMPARE(Instruction(pair.code).to_str(), pair.str);
}
}
Expand All @@ -84,22 +82,15 @@ void TestInstruction::instruction_code_from_str() {
? code_to_string[i].str
: code_to_string[i].alias_str;
uint32_t code = 0;
Instruction::code_from_string(
&code, code_to_string[i].str.length(), test_string_data, Address(0x0));
QCOMPARE(code, code_to_string[i].code);
}

for (size_t i = 0; i < sizeof(pesude_code_to_string) / sizeof(pesude_code_to_string[0]); i++) {
uint32_t code[2];
RelocExpressionList reloc = {};
Instruction::code_from_string(
code, pesude_code_to_string[i].string_data.length(),
pesude_code_to_string[i].string_data, Address(0x0), &reloc, nullptr, 0, true);
for (size_t j = 0; j < pesude_code_to_string[i].pairs.size(); j++) {
Pair pair = pesude_code_to_string[i].pairs[j];
QCOMPARE(code[j], pair.code);
}
reloc.clear();
try {
Instruction::code_from_string(
&code, code_to_string[i].str.length(), test_string_data, Address(0x0));
QCOMPARE(code, code_to_string[i].code);
} catch (const Instruction::ParseError &e) {
TokenizedInstruction inst
= TokenizedInstruction::from_line(test_string_data, Address(0x0), nullptr, 0);
QFAIL(qPrintable(e.message));
} catch (...) { QFAIL("code_from_string throw unexpected exception"); }
}
}

Expand Down
16 changes: 8 additions & 8 deletions src/machine/instruction.test.data.h → src/machine/instruction.test.data.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,11 +182,11 @@
{0x100073, "ebreak"},
{0x10200073, "sret"},
{0x30200073, "mret"},
{0x109073, "csrrw x0, 0x1, x1", "csrw 0x1, x1"},
{0x1090f3, "csrrw x1, 0x1, x1"},
{0x1020f3, "csrrs x1, 0x1, x0", "csrr x1, 0x1"},
{0x10a0f3, "csrrs x1, 0x1, x1"},
{0x10b0f3, "csrrc x1, 0x1, x1"},
{0x10d0f3, "csrrwi x1, 0x1, 0x1"},
{0x10e0f3, "csrrsi x1, 0x1, 0x1"},
{0x10f0f3, "csrrci x1, 0x1, 0x1"},
{0xf1209073, "csrrw x0, 0xf12, x1", "csrw 0xf12, x1"},
{0xf12090f3, "csrrw x1, 0xf12, x1"},
{0xf12020f3, "csrrs x1, 0xf12, x0", "csrr x1, 0xf12"},
{0xf120a0f3, "csrrs x1, 0xf12, x1"},
{0xf120b0f3, "csrrc x1, 0xf12, x1"},
{0xf120d0f3, "csrrwi x1, 0xf12, 0x1"},
{0xf120e0f3, "csrrsi x1, 0xf12, 0x1"},
{0xf120f0f3, "csrrci x1, 0xf12, 0x1"},
69 changes: 44 additions & 25 deletions src/machine/instruction.test.gendata.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,23 @@
#include "machine/instruction.cpp"

#include <QFile>

#include <QMap>
using namespace machine;

static uint32_t MASK_AMO_RS2 = 0b1111100000000000000000000;
static const uint32_t MASK_AMO_RS2 = 0b1111100000000000000000000;
static const uint32_t MASK_I_RS1 = 0b11111000000000000000;

#define AMO_MAP_4ITEMS(NAME_BASE, MASK) \
{ NAME_BASE, MASK }, { NAME_BASE ".rl", MASK }, { NAME_BASE ".aq", MASK }, \
{ NAME_BASE ".aqrl", MASK },
#define AMO_MAP_4ITEMS(NAME, MASK) \
{ NAME, MASK }, { NAME ".aq", MASK }, { NAME ".rl", MASK }, { \
NAME ".aqrl", MASK \
}

static std::unordered_map<QString, uint32_t> mask_map
= { AMO_MAP_4ITEMS("lr.w", MASK_AMO_RS2) AMO_MAP_4ITEMS("lr.d", MASK_AMO_RS2) };
static const QMap<QString, uint32_t> zero_mask_tb = {
// lr.w/d rs2 = 0
AMO_MAP_4ITEMS("lr.w", ~MASK_AMO_RS2), AMO_MAP_4ITEMS("lr.d", ~MASK_AMO_RS2),
// csrw(alias of csrrs) rs1 = 0
// { "csrrs", MASK_I_RS1 }
};

void generate_code_and_string_data(
QTextStream &out,
Expand All @@ -22,15 +28,15 @@ void generate_code_and_string_data(
const InstructionMap *alias_parent) {
for (int i = 0;; i++) {
if (alias_parent == nullptr) {
// end of bits
// end of subclass table
if (i >= (1 << subfield.count)) { break; }
} else {
// end of alias
if (im_iter[i].name == nullptr) { break; }
}
const InstructionMap *im = &im_iter[i];

if (im->name == "unknown") { continue; }
if (QString(im->name) == "unknown") { continue; }

if (im->subclass != nullptr) {
generate_code_and_string_data(out, im->subclass, im->subfield, nullptr);
Expand All @@ -41,7 +47,7 @@ void generate_code_and_string_data(
QString string_data = im->name;

if (im->args.size()) {
int val_mask;
uint32_t val_mask = 0;
Instruction::Type t = im->type;
if (alias_parent != nullptr) { t = alias_parent->type; }
switch (t) {
Expand All @@ -52,7 +58,8 @@ void generate_code_and_string_data(
}
case Instruction::Type::I: val_mask = 0b00000000000100001000000010000000; break;
case Instruction::Type::ZICSR: {
val_mask = 0b00000000000100001000000010000000;
// dest is not set here
val_mask = 0b00000000000000001000000010000000;
break;
}
case Instruction::Type::S: {
Expand All @@ -76,7 +83,7 @@ void generate_code_and_string_data(
}
}
code |= val_mask & ~im->mask;
if (mask_map.count(im->name)) { code &= ~mask_map[im->name]; }
if (zero_mask_tb.count(im->name)) { code &= zero_mask_tb[im->name]; }

QString next_delim = " ";
for (const QString &arg_string : im->args) {
Expand Down Expand Up @@ -108,7 +115,17 @@ void generate_code_and_string_data(
break;
}
case 'E': {
string_data += "0x1";
int i = 0;
for (auto &reg : CSR::REGISTERS) {
if (i < 2) {
i++;
continue;
}
string_data += QString::asprintf("0x%x", reg.address.data);
code |= reg.address.data << 20;
if (zero_mask_tb.count(im->name)) { code &= zero_mask_tb[im->name]; }
break;
}
break;
}
}
Expand All @@ -120,32 +137,34 @@ void generate_code_and_string_data(
generate_code_and_string_data(out, im->aliases, im->subfield, im);
}

QString enum_str;
QString elem_str;
bool check_failed = false;
QString parsed_string_data = Instruction(code).to_str();
uint32_t parsed_code;
Instruction::code_from_string(
&parsed_code, parsed_string_data.length(), string_data, Address(0x0));
if (alias_parent == nullptr) {
enum_str = QString::asprintf("{0x%x, \"%s\"},", code, qPrintable(string_data));
// base inst
elem_str = QString::asprintf("{0x%x, \"%s\"},", code, qPrintable(string_data));
if (parsed_string_data != string_data) { check_failed = true; }
} else {
enum_str = QString::asprintf(
// alias inst
elem_str = QString::asprintf(
"{0x%x, \"%s\", \"%s\"},", code, qPrintable(parsed_string_data),
qPrintable(string_data));
if (parsed_code != code) { check_failed = true; }
}
uint32_t parsed_code;
Instruction::code_from_string(
&parsed_code, parsed_string_data.length(), string_data, Address(0x0));
if (parsed_code != code) { check_failed = true; }
if (check_failed) { enum_str += " // failed"; }
if (check_failed) { elem_str += " // failed"; }

enum_str += "\n";
out << enum_str;
elem_str += "\n";
out << elem_str;
}
}

int main(int argc, char *argv[]) {
int main() {
fill_argdesbycode();
instruction_from_string_build_base();
QFile outfile("instruction.test.data.h");
QFile outfile("instruction.test.data.def");
if (outfile.open(QIODevice::WriteOnly | QIODevice::Text)) {
QTextStream out(&outfile);
generate_code_and_string_data(out, C_inst_map, instruction_map_opcode_field, nullptr);
Expand Down
5 changes: 3 additions & 2 deletions src/machine/programloader.test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@ void TestProgramLoader::program_loader() {
pl.to_memory(&m);

// addi $1, $0, 6
QCOMPARE(Instruction(memory_read_u32(&m, PC_INIT)), Instruction());
// QCOMPARE(Instruction(memory_read_u32(&m, PC_INIT)), Instruction(8, 0, 1, 6));
// j (8)0020000 (only 28 bits are used and they are logically shifted left
// by 2)
QCOMPARE(Instruction(memory_read_u32(&m, PC_INIT + 4)), Instruction(0x0));
// QCOMPARE(Instruction(memory_read_u32(&m, PC_INIT + 4)), Instruction(2, Address(0x20000 >>
// 2)));
// TODO add some more code to data and do more compares (for example more
// sections)
}
Expand Down
2 changes: 1 addition & 1 deletion src/machine/programloader.test.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
class TestProgramLoader : public QObject {
Q_OBJECT

private slots:
public slots:
void program_loader();
};

Expand Down

0 comments on commit 91667bb

Please sign in to comment.