1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move registers into header and make them static

Browse Source 
We were leaking these as global symbols and were having linking errors
with Clang 12.
This commit is contained in:
Alan Wu 2020-10-03 18:35:15 -04:00
parent e3cd43e2bc
commit 7fbf6d4019
2 changed files with 66 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
ujit_asm.c
View File

@ -8,84 +8,6 @@
#include "ujit_asm.h" #include "ujit_asm.h"
// Dummy none/null operand
const x86opnd_t NO_OPND = { OPND_NONE, 0, .imm = 0 };
// Instruction pointer
const x86opnd_t RIP = { OPND_REG, 64, .reg = { REG_IP, 5 }};
// 64-bit GP registers
const x86opnd_t RAX = { OPND_REG, 64, .reg = { REG_GP, 0 }};
const x86opnd_t RCX = { OPND_REG, 64, .reg = { REG_GP, 1 }};
const x86opnd_t RDX = { OPND_REG, 64, .reg = { REG_GP, 2 }};
const x86opnd_t RBX = { OPND_REG, 64, .reg = { REG_GP, 3 }};
const x86opnd_t RSP = { OPND_REG, 64, .reg = { REG_GP, 4 }};
const x86opnd_t RBP = { OPND_REG, 64, .reg = { REG_GP, 5 }};
const x86opnd_t RSI = { OPND_REG, 64, .reg = { REG_GP, 6 }};
const x86opnd_t RDI = { OPND_REG, 64, .reg = { REG_GP, 7 }};
const x86opnd_t R8 = { OPND_REG, 64, .reg = { REG_GP, 8 }};
const x86opnd_t R9 = { OPND_REG, 64, .reg = { REG_GP, 9 }};
const x86opnd_t R10 = { OPND_REG, 64, .reg = { REG_GP, 10 }};
const x86opnd_t R11 = { OPND_REG, 64, .reg = { REG_GP, 11 }};
const x86opnd_t R12 = { OPND_REG, 64, .reg = { REG_GP, 12 }};
const x86opnd_t R13 = { OPND_REG, 64, .reg = { REG_GP, 13 }};
const x86opnd_t R14 = { OPND_REG, 64, .reg = { REG_GP, 14 }};
const x86opnd_t R15 = { OPND_REG, 64, .reg = { REG_GP, 15 }};
// 32-bit GP registers
const x86opnd_t EAX = { OPND_REG, 32, .reg = { REG_GP, 0 }};
const x86opnd_t ECX = { OPND_REG, 32, .reg = { REG_GP, 1 }};
const x86opnd_t EDX = { OPND_REG, 32, .reg = { REG_GP, 2 }};
const x86opnd_t EBX = { OPND_REG, 32, .reg = { REG_GP, 3 }};
const x86opnd_t ESP = { OPND_REG, 32, .reg = { REG_GP, 4 }};
const x86opnd_t EBP = { OPND_REG, 32, .reg = { REG_GP, 5 }};
const x86opnd_t ESI = { OPND_REG, 32, .reg = { REG_GP, 6 }};
const x86opnd_t EDI = { OPND_REG, 32, .reg = { REG_GP, 7 }};
const x86opnd_t R8D = { OPND_REG, 32, .reg = { REG_GP, 8 }};
const x86opnd_t R9D = { OPND_REG, 32, .reg = { REG_GP, 9 }};
const x86opnd_t R10D = { OPND_REG, 32, .reg = { REG_GP, 10 }};
const x86opnd_t R11D = { OPND_REG, 32, .reg = { REG_GP, 11 }};
const x86opnd_t R12D = { OPND_REG, 32, .reg = { REG_GP, 12 }};
const x86opnd_t R13D = { OPND_REG, 32, .reg = { REG_GP, 13 }};
const x86opnd_t R14D = { OPND_REG, 32, .reg = { REG_GP, 14 }};
const x86opnd_t R15D = { OPND_REG, 32, .reg = { REG_GP, 15 }};
// 16-bit GP registers
const x86opnd_t AX = { OPND_REG, 16, .reg = { REG_GP, 0 }};
const x86opnd_t CX = { OPND_REG, 16, .reg = { REG_GP, 1 }};
const x86opnd_t DX = { OPND_REG, 16, .reg = { REG_GP, 2 }};
const x86opnd_t BX = { OPND_REG, 16, .reg = { REG_GP, 3 }};
const x86opnd_t SP = { OPND_REG, 16, .reg = { REG_GP, 4 }};
const x86opnd_t BP = { OPND_REG, 16, .reg = { REG_GP, 5 }};
const x86opnd_t SI = { OPND_REG, 16, .reg = { REG_GP, 6 }};
const x86opnd_t DI = { OPND_REG, 16, .reg = { REG_GP, 7 }};
const x86opnd_t R8W = { OPND_REG, 16, .reg = { REG_GP, 8 }};
const x86opnd_t R9W = { OPND_REG, 16, .reg = { REG_GP, 9 }};
const x86opnd_t R10W = { OPND_REG, 16, .reg = { REG_GP, 10 }};
const x86opnd_t R11W = { OPND_REG, 16, .reg = { REG_GP, 11 }};
const x86opnd_t R12W = { OPND_REG, 16, .reg = { REG_GP, 12 }};
const x86opnd_t R13W = { OPND_REG, 16, .reg = { REG_GP, 13 }};
const x86opnd_t R14W = { OPND_REG, 16, .reg = { REG_GP, 14 }};
const x86opnd_t R15W = { OPND_REG, 16, .reg = { REG_GP, 15 }};
// 8-bit GP registers
const x86opnd_t AL = { OPND_REG, 8, .reg = { REG_GP, 0 }};
const x86opnd_t CL = { OPND_REG, 8, .reg = { REG_GP, 1 }};
const x86opnd_t DL = { OPND_REG, 8, .reg = { REG_GP, 2 }};
const x86opnd_t BL = { OPND_REG, 8, .reg = { REG_GP, 3 }};
const x86opnd_t SPL = { OPND_REG, 8, .reg = { REG_GP, 4 }};
const x86opnd_t BPL = { OPND_REG, 8, .reg = { REG_GP, 5 }};
const x86opnd_t SIL = { OPND_REG, 8, .reg = { REG_GP, 6 }};
const x86opnd_t DIL = { OPND_REG, 8, .reg = { REG_GP, 7 }};
const x86opnd_t R8B = { OPND_REG, 8, .reg = { REG_GP, 8 }};
const x86opnd_t R9B = { OPND_REG, 8, .reg = { REG_GP, 9 }};
const x86opnd_t R10B = { OPND_REG, 8, .reg = { REG_GP, 10 }};
const x86opnd_t R11B = { OPND_REG, 8, .reg = { REG_GP, 11 }};
const x86opnd_t R12B = { OPND_REG, 8, .reg = { REG_GP, 12 }};
const x86opnd_t R13B = { OPND_REG, 8, .reg = { REG_GP, 13 }};
const x86opnd_t R14B = { OPND_REG, 8, .reg = { REG_GP, 14 }};
const x86opnd_t R15B = { OPND_REG, 8, .reg = { REG_GP, 15 }};
// Compute the number of bits needed to encode a signed value // Compute the number of bits needed to encode a signed value
size_t sig_imm_size(int64_t imm) size_t sig_imm_size(int64_t imm)
{ {

132
ujit_asm.h
View File

@ -132,82 +132,82 @@ typedef struct X86Opnd
} x86opnd_t; } x86opnd_t;
// Dummy none/null operand // Dummy none/null operand
const x86opnd_t NO_OPND; static const x86opnd_t NO_OPND = { OPND_NONE, 0, .imm = 0 };
// Instruction pointer // Instruction pointer
const x86opnd_t RIP; static const x86opnd_t RIP = { OPND_REG, 64, .reg = { REG_IP, 5 }};
// 64-bit GP registers // 64-bit GP registers
const x86opnd_t RAX; static const x86opnd_t RAX = { OPND_REG, 64, .reg = { REG_GP, 0 }};
const x86opnd_t RCX; static const x86opnd_t RCX = { OPND_REG, 64, .reg = { REG_GP, 1 }};
const x86opnd_t RDX; static const x86opnd_t RDX = { OPND_REG, 64, .reg = { REG_GP, 2 }};
const x86opnd_t RBX; static const x86opnd_t RBX = { OPND_REG, 64, .reg = { REG_GP, 3 }};
const x86opnd_t RBP; static const x86opnd_t RSP = { OPND_REG, 64, .reg = { REG_GP, 4 }};
const x86opnd_t RSP; static const x86opnd_t RBP = { OPND_REG, 64, .reg = { REG_GP, 5 }};
const x86opnd_t RSI; static const x86opnd_t RSI = { OPND_REG, 64, .reg = { REG_GP, 6 }};
const x86opnd_t RDI; static const x86opnd_t RDI = { OPND_REG, 64, .reg = { REG_GP, 7 }};
const x86opnd_t R8; static const x86opnd_t R8 = { OPND_REG, 64, .reg = { REG_GP, 8 }};
const x86opnd_t R9; static const x86opnd_t R9 = { OPND_REG, 64, .reg = { REG_GP, 9 }};
const x86opnd_t R10; static const x86opnd_t R10 = { OPND_REG, 64, .reg = { REG_GP, 10 }};
const x86opnd_t R11; static const x86opnd_t R11 = { OPND_REG, 64, .reg = { REG_GP, 11 }};
const x86opnd_t R12; static const x86opnd_t R12 = { OPND_REG, 64, .reg = { REG_GP, 12 }};
const x86opnd_t R13; static const x86opnd_t R13 = { OPND_REG, 64, .reg = { REG_GP, 13 }};
const x86opnd_t R14; static const x86opnd_t R14 = { OPND_REG, 64, .reg = { REG_GP, 14 }};
const x86opnd_t R15; static const x86opnd_t R15 = { OPND_REG, 64, .reg = { REG_GP, 15 }};
// 32-bit GP registers // 32-bit GP registers
const x86opnd_t EAX; static const x86opnd_t EAX = { OPND_REG, 32, .reg = { REG_GP, 0 }};
const x86opnd_t ECX; static const x86opnd_t ECX = { OPND_REG, 32, .reg = { REG_GP, 1 }};
const x86opnd_t EDX; static const x86opnd_t EDX = { OPND_REG, 32, .reg = { REG_GP, 2 }};
const x86opnd_t EBX; static const x86opnd_t EBX = { OPND_REG, 32, .reg = { REG_GP, 3 }};
const x86opnd_t EBP; static const x86opnd_t ESP = { OPND_REG, 32, .reg = { REG_GP, 4 }};
const x86opnd_t ESP; static const x86opnd_t EBP = { OPND_REG, 32, .reg = { REG_GP, 5 }};
const x86opnd_t ESI; static const x86opnd_t ESI = { OPND_REG, 32, .reg = { REG_GP, 6 }};
const x86opnd_t EDI; static const x86opnd_t EDI = { OPND_REG, 32, .reg = { REG_GP, 7 }};
const x86opnd_t R8D; static const x86opnd_t R8D = { OPND_REG, 32, .reg = { REG_GP, 8 }};
const x86opnd_t R9D; static const x86opnd_t R9D = { OPND_REG, 32, .reg = { REG_GP, 9 }};
const x86opnd_t R10D; static const x86opnd_t R10D = { OPND_REG, 32, .reg = { REG_GP, 10 }};
const x86opnd_t R11D; static const x86opnd_t R11D = { OPND_REG, 32, .reg = { REG_GP, 11 }};
const x86opnd_t R12D; static const x86opnd_t R12D = { OPND_REG, 32, .reg = { REG_GP, 12 }};
const x86opnd_t R13D; static const x86opnd_t R13D = { OPND_REG, 32, .reg = { REG_GP, 13 }};
const x86opnd_t R14D; static const x86opnd_t R14D = { OPND_REG, 32, .reg = { REG_GP, 14 }};
const x86opnd_t R15D; static const x86opnd_t R15D = { OPND_REG, 32, .reg = { REG_GP, 15 }};
// 16-bit GP registers // 16-bit GP registers
const x86opnd_t AX; static const x86opnd_t AX = { OPND_REG, 16, .reg = { REG_GP, 0 }};
const x86opnd_t CX; static const x86opnd_t CX = { OPND_REG, 16, .reg = { REG_GP, 1 }};
const x86opnd_t DX; static const x86opnd_t DX = { OPND_REG, 16, .reg = { REG_GP, 2 }};
const x86opnd_t BX; static const x86opnd_t BX = { OPND_REG, 16, .reg = { REG_GP, 3 }};
const x86opnd_t SP; static const x86opnd_t SP = { OPND_REG, 16, .reg = { REG_GP, 4 }};
const x86opnd_t BP; static const x86opnd_t BP = { OPND_REG, 16, .reg = { REG_GP, 5 }};
const x86opnd_t SI; static const x86opnd_t SI = { OPND_REG, 16, .reg = { REG_GP, 6 }};
const x86opnd_t DI; static const x86opnd_t DI = { OPND_REG, 16, .reg = { REG_GP, 7 }};
const x86opnd_t R8W; static const x86opnd_t R8W = { OPND_REG, 16, .reg = { REG_GP, 8 }};
const x86opnd_t R9W; static const x86opnd_t R9W = { OPND_REG, 16, .reg = { REG_GP, 9 }};
const x86opnd_t R10W; static const x86opnd_t R10W = { OPND_REG, 16, .reg = { REG_GP, 10 }};
const x86opnd_t R11W; static const x86opnd_t R11W = { OPND_REG, 16, .reg = { REG_GP, 11 }};
const x86opnd_t R12W; static const x86opnd_t R12W = { OPND_REG, 16, .reg = { REG_GP, 12 }};
const x86opnd_t R13W; static const x86opnd_t R13W = { OPND_REG, 16, .reg = { REG_GP, 13 }};
const x86opnd_t R14W; static const x86opnd_t R14W = { OPND_REG, 16, .reg = { REG_GP, 14 }};
const x86opnd_t R15W; static const x86opnd_t R15W = { OPND_REG, 16, .reg = { REG_GP, 15 }};
// 8-bit GP registers // 8-bit GP registers
const x86opnd_t AL; static const x86opnd_t AL = { OPND_REG, 8, .reg = { REG_GP, 0 }};
const x86opnd_t CL; static const x86opnd_t CL = { OPND_REG, 8, .reg = { REG_GP, 1 }};
const x86opnd_t DL; static const x86opnd_t DL = { OPND_REG, 8, .reg = { REG_GP, 2 }};
const x86opnd_t BL; static const x86opnd_t BL = { OPND_REG, 8, .reg = { REG_GP, 3 }};
const x86opnd_t SPL; static const x86opnd_t SPL = { OPND_REG, 8, .reg = { REG_GP, 4 }};
const x86opnd_t BPL; static const x86opnd_t BPL = { OPND_REG, 8, .reg = { REG_GP, 5 }};
const x86opnd_t SIL; static const x86opnd_t SIL = { OPND_REG, 8, .reg = { REG_GP, 6 }};
const x86opnd_t DIL; static const x86opnd_t DIL = { OPND_REG, 8, .reg = { REG_GP, 7 }};
const x86opnd_t R8B; static const x86opnd_t R8B = { OPND_REG, 8, .reg = { REG_GP, 8 }};
const x86opnd_t R9B; static const x86opnd_t R9B = { OPND_REG, 8, .reg = { REG_GP, 9 }};
const x86opnd_t R10B; static const x86opnd_t R10B = { OPND_REG, 8, .reg = { REG_GP, 10 }};
const x86opnd_t R11B; static const x86opnd_t R11B = { OPND_REG, 8, .reg = { REG_GP, 11 }};
const x86opnd_t R12B; static const x86opnd_t R12B = { OPND_REG, 8, .reg = { REG_GP, 12 }};
const x86opnd_t R13B; static const x86opnd_t R13B = { OPND_REG, 8, .reg = { REG_GP, 13 }};
const x86opnd_t R14B; static const x86opnd_t R14B = { OPND_REG, 8, .reg = { REG_GP, 14 }};
const x86opnd_t R15B; static const x86opnd_t R15B = { OPND_REG, 8, .reg = { REG_GP, 15 }};
// Memory operand with base register and displacement/offset // Memory operand with base register and displacement/offset
x86opnd_t mem_opnd(size_t num_bits, x86opnd_t base_reg, int32_t disp); x86opnd_t mem_opnd(size_t num_bits, x86opnd_t base_reg, int32_t disp);