Skip to content

Fix issue #19 [ci patch inc] #21

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
HyperWinX merged 1 commit into from
Apr 21, 2025
Merged

Fix issue #19 [ci patch inc] #21

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 36 additions & 14 deletions src/Assembler/Core/BinaryTransformer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,24 @@ void HCAsm::BinaryTransformer::EncodeInstruction(HCAsm::Instruction& instr) {
case HyperCPU::OperandTypes::RM_IMM:
case HyperCPU::OperandTypes::R_IMM:
res.push(static_cast<std::uint8_t>(instr.op1.reg));
switch (md) {
case HCAsm::Mode::b8: res.push(static_cast<std::uint8_t>(std::get<std::uint64_t>(instr.op2.variant))); break;
case HCAsm::Mode::b16: res.push(static_cast<std::uint16_t>(std::get<std::uint64_t>(instr.op2.variant))); break;
case HCAsm::Mode::b32: res.push(static_cast<std::uint32_t>(std::get<std::uint64_t>(instr.op2.variant))); break;
case HCAsm::Mode::b64: res.push(static_cast<std::uint64_t>(std::get<std::uint64_t>(instr.op2.variant))); break;
default:
UNREACHABLE();
if (std::holds_alternative<std::uint64_t>(instr.op2.variant)) {
switch (md) {
case HCAsm::Mode::b8: res.push(static_cast<std::uint8_t>(std::get<std::uint64_t>(instr.op2.variant))); break;
case HCAsm::Mode::b16: res.push(static_cast<std::uint16_t>(std::get<std::uint64_t>(instr.op2.variant))); break;
case HCAsm::Mode::b32: res.push(static_cast<std::uint32_t>(std::get<std::uint64_t>(instr.op2.variant))); break;
case HCAsm::Mode::b64: res.push(static_cast<std::uint64_t>(std::get<std::uint64_t>(instr.op2.variant))); break;
default:
UNREACHABLE();
}
} else {
switch (md) {
case HCAsm::Mode::b8: res.push(static_cast<std::int8_t>(std::get<std::int64_t>(instr.op2.variant))); break;
case HCAsm::Mode::b16: res.push(static_cast<std::int16_t>(std::get<std::int64_t>(instr.op2.variant))); break;
case HCAsm::Mode::b32: res.push(static_cast<std::int32_t>(std::get<std::int64_t>(instr.op2.variant))); break;
case HCAsm::Mode::b64: res.push(static_cast<std::int64_t>(std::get<std::int64_t>(instr.op2.variant))); break;
default:
UNREACHABLE();
}
}
break;
case HyperCPU::OperandTypes::R:
Expand All @@ -169,13 +180,24 @@ void HCAsm::BinaryTransformer::EncodeInstruction(HCAsm::Instruction& instr) {
res.push(std::get<std::uint64_t>(instr.op2.variant));
break;
case HyperCPU::OperandTypes::IMM:
switch (md) {
case HCAsm::Mode::b8: res.push(static_cast<std::uint8_t>(std::get<std::uint64_t>(instr.op1.variant))); break;
case HCAsm::Mode::b16: res.push(static_cast<std::uint16_t>(std::get<std::uint64_t>(instr.op1.variant))); break;
case HCAsm::Mode::b32: res.push(static_cast<std::uint32_t>(std::get<std::uint64_t>(instr.op1.variant))); break;
case HCAsm::Mode::b64: res.push(static_cast<std::uint64_t>(std::get<std::uint64_t>(instr.op1.variant))); break;
default:
UNREACHABLE();
if (std::holds_alternative<std::uint64_t>(instr.op2.variant)) {
switch (md) {
case HCAsm::Mode::b8: res.push(static_cast<std::uint8_t>(std::get<std::uint64_t>(instr.op1.variant))); break;
case HCAsm::Mode::b16: res.push(static_cast<std::uint16_t>(std::get<std::uint64_t>(instr.op1.variant))); break;
case HCAsm::Mode::b32: res.push(static_cast<std::uint32_t>(std::get<std::uint64_t>(instr.op1.variant))); break;
case HCAsm::Mode::b64: res.push(static_cast<std::uint64_t>(std::get<std::uint64_t>(instr.op1.variant))); break;
default:
UNREACHABLE();
}
} else {
switch (md) {
case HCAsm::Mode::b8: res.push(static_cast<std::int8_t>(std::get<std::int64_t>(instr.op1.variant))); break;
case HCAsm::Mode::b16: res.push(static_cast<std::int16_t>(std::get<std::int64_t>(instr.op1.variant))); break;
case HCAsm::Mode::b32: res.push(static_cast<std::int32_t>(std::get<std::int64_t>(instr.op1.variant))); break;
case HCAsm::Mode::b64: res.push(static_cast<std::int64_t>(std::get<std::int64_t>(instr.op1.variant))); break;
default:
UNREACHABLE();
}
}
break;
case HyperCPU::OperandTypes::M_R:
Expand Down
5 changes: 3 additions & 2 deletions src/Assembler/Core/Compiler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ namespace HCAsm {
};

template<typename T>
concept UnsignedIntegral = std::is_integral_v<T> && std::is_unsigned_v<T>;
concept Integral = std::is_integral_v<T>;

struct BinaryResult {
BinaryResult() : binary(nullptr), ptr(0), entry_point(0) { }
Expand All @@ -89,7 +89,7 @@ namespace HCAsm {
std::uint64_t ptr;
std::uint32_t entry_point;

template<UnsignedIntegral T>
template<Integral T>
constexpr inline void push(T data) {
std::memcpy(binary + ptr, &data, sizeof(data));
ptr += sizeof(data);
Expand Down Expand Up @@ -153,6 +153,7 @@ namespace HCAsm {
case Registers::X7:
case Registers::XBP:
case Registers::XSP:
case Registers::XIP:
return Mode::b64;
case Registers::XH0:
case Registers::XH1:
Expand Down