andre/tyche
1
0
Fork 0
Code Pull Requests Actions Packages Releases Activity

.

Browse Source
This commit is contained in:
Andre Wagner
2026-05-15 07:57:17 -05:00
parent c8a6db0e4e
commit 06e5be5c89
2 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/code.c
View File

@@ -139,19 +139,19 @@ Instruction code_next_instruction(Code const* code, uint32_t function_id, uint32
uint8_t sz = 1;
if (opcode >= OP_8BIT_OPERAND && opcode < OP_16BIT_OPERAND) {
operand = code->bytecode[addr + 1];
operand = (int8_t) code->bytecode[addr + 1];
sz = 2;
} else if (opcode >= OP_16BIT_OPERAND && opcode < OP_32BIT_OPERAND) {
opcode -= 0x20;
operand = (uint16_t) code->bytecode[addr + 1] |
(uint16_t) (code->bytecode[addr + 2] << 8);
operand = (int16_t) ((uint16_t) code->bytecode[addr + 1] |
(uint16_t) (code->bytecode[addr + 2] << 8));
sz = 3;
} else if (opcode >= OP_32BIT_OPERAND) {
opcode -= 0x40;
operand = (uint32_t) code->bytecode[addr + 1] |
operand = (int32_t) ((uint32_t) code->bytecode[addr + 1] |
(uint32_t) (code->bytecode[addr + 2] << 8) |
(uint32_t) (code->bytecode[addr + 3] << 16) |
(uint32_t) (code->bytecode[addr + 4] << 24);
(uint32_t) (code->bytecode[addr + 4] << 24));
sz = 5;
}

28
lib/compiler/compiler.lua
View File

@@ -37,7 +37,7 @@ local function parse_assembly(source)
end
elseif section == 'function' then
local regexes = {
"^%s*(%a+)%s+(%d+)%s*$", -- instruction + parameter
"^%s*(%a+)%s+(-?%d+)%s*$", -- instruction + parameter
"^%s*(%a+)%s+(@[%a_][%a%d_]*)%s*$", -- instruction + label
"^%s*(%a+)%s*$", -- instruction only
"^(@[%a_][%a%d_]*):%s*$", -- label
@@ -161,6 +161,10 @@ local VERSION = 1
local function assemble(proto)
local bin = {}
local push8 = function(data)
table.insert(bin, data & 0xff)
end
local push16 = function(data)
table.insert(bin, data & 0xff)
table.insert(bin, (data >> 8) & 0xff)
@@ -198,13 +202,13 @@ local function assemble(proto)
for i=0,#proto.constants do
local const = proto.constants[i]
if type(const) == 'string' then
table.insert(bin, 0) -- string type
push8(0) -- string type
for c in const:gmatch('.') do
table.insert(bin, c:byte())
push8(c:byte())
end
table.insert(bin, 0) -- string terminator
push8(0) -- string terminator
elseif type(const) == 'number' then
table.insert(bin, 1) -- float type
push8(1) -- float type
push32(float_to_bits(const))
end
end
@@ -222,25 +226,27 @@ local function assemble(proto)
local opcode, operand = instructions[inst[1]], inst[2]
if opcode == nil then error("Unknown instruction " .. inst[1]) end
if operand == nil then
table.insert(bin, opcode)
push8(opcode)
else
if opcode >= 0xc0 and opcode < 0xe0 then
table.insert(bin, opcode)
push8(opcode)
push16(operand)
elseif operand >= -128 and operand <= 127 then
table.insert(bin, opcode)
table.insert(bin, operand)
push8(opcode)
push8(operand)
elseif operand >= -32768 and operand <= 32767 then
table.insert(bin, opcode + 0x20)
push8(opcode + 0x20)
push16(operand)
else
table.insert(bin, opcode + 0x40)
push8(opcode + 0x40)
push32(operand)
end
end
end
replace32(next_function_pos, #bin)
end
-- for _, b in ipairs(bin) do io.write(b .. ' ') end; print()
return string.char(table.unpack(bin))
end