RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 01:47:34 +00:00
Code Issues Activity Actions

Revert "Userland: static vs non-static constexpr variables"

Browse source 
This reverts commit 800ea8ea96.

Booting the system no longer worked after these changes.
This commit is contained in:
Linus Groh 2021-05-21 10:30:21 +01:00
parent 68f76b9e37
commit d60ebbbba6
38 changed files with 184 additions and 192 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibX86/Instruction.cpp
View file

@ -100,7 +100,7 @@ static void build(InstructionDescriptor* table, u8 op, const char* mnemonic, Ins
case OP_AX_moff16:
case OP_EAX_moff32:
case OP_NEAR_imm:
d.imm1_bytes = InstructionDescriptor::CurrentAddressSize;
d.imm1_bytes = CurrentAddressSize;
break;
//default:
case InvalidFormat:

10
Userland/Libraries/LibX86/Instruction.h
View file

@ -28,9 +28,9 @@ protected:
template<typename T>
struct TypeTrivia {
static constexpr size_t bits = sizeof(T) * 8;
static constexpr T sign_bit = 1 << (bits - 1);
static constexpr T mask = MakeUnsigned<T>(-1);
static const size_t bits = sizeof(T) * 8;
static const T sign_bit = 1 << (bits - 1);
static const T mask = MakeUnsigned<T>(-1);
};
template<typename T, typename U>
@ -159,9 +159,9 @@ enum InstructionFormat {
OP_NEAR_imm,
};
struct InstructionDescriptor {
static constexpr unsigned CurrentAddressSize = 0xB33FBABE;
static const unsigned CurrentAddressSize = 0xB33FBABE;
struct InstructionDescriptor {
InstructionHandler handler { nullptr };
bool opcode_has_register_index { false };
const char* mnemonic { nullptr };