Target register tidying

This commit is contained in:
Nav
2021-07-20 19:21:18 +01:00
parent c0b99516d3
commit 8a048311ac
3 changed files with 11 additions and 21 deletions

View File

@@ -12,17 +12,17 @@ namespace Bloom::Targets
PROGRAM_COUNTER,
STACK_POINTER,
STATUS_REGISTER,
OTHER,
};
struct TargetRegisterDescriptor
{
using IdType = size_t;
std::optional<IdType> id;
TargetRegisterType type = TargetRegisterType::GENERAL_PURPOSE_REGISTER;
std::optional<size_t> id;
TargetRegisterType type = TargetRegisterType::OTHER;
TargetRegisterDescriptor() = default;
explicit TargetRegisterDescriptor(TargetRegisterType type): type(type) {};
TargetRegisterDescriptor(IdType id, TargetRegisterType type): id(id), type(type) {};
TargetRegisterDescriptor(size_t id, TargetRegisterType type): id(id), type(type) {};
bool operator==(const TargetRegisterDescriptor& other) const {
return this->id == other.id && this->type == other.type;
@@ -31,19 +31,12 @@ namespace Bloom::Targets
struct TargetRegister
{
std::optional<size_t> id;
std::vector<unsigned char> value;
TargetRegisterDescriptor descriptor;
explicit TargetRegister(std::vector<unsigned char> value): value(std::move(value)) {};
std::vector<unsigned char> value;
TargetRegister(TargetRegisterDescriptor descriptor, std::vector<unsigned char> value): value(std::move(value)),
descriptor(descriptor) {};
TargetRegister(size_t id, std::vector<unsigned char> value): id(id), value(std::move(value)) {
this->descriptor.id = id;
};
[[nodiscard]] size_t size() const {
return this->value.size();
}