notwa/mm
1
0
Fork 0
mirror of https://github.com/notwa/mm synced 2025-02-05 13:23:23 -08:00
Code Issues Releases Wiki Activity

pseudo-instruction crap

Browse source
This commit is contained in:
Connor Olding 2015-11-21 19:30:02 -08:00
parent f673308437
commit cdeb4b0489
1 changed files with 45 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
Lua/inject/assembler.lua
View file

@ -1,7 +1,6 @@
-- i've lost control of my life -- i've lost control of my life
-- instructions: https://github.com/mikeryan/n64dev/tree/master/docs/n64ops -- instructions: https://github.com/mikeryan/n64dev/tree/master/docs/n64ops
-- CajeASM style assembly; refer to the manual included with CajeASM.
-- lexer and parser are somewhat based on http://chunkbake.luaforge.net/ -- lexer and parser are somewhat based on http://chunkbake.luaforge.net/
local assembler = { local assembler = {
@ -126,7 +125,7 @@ local instruction_handlers = {
SWL = {42, 'tob', 'bto'}, SWL = {42, 'tob', 'bto'},
SWR = {46, 'tob', 'bto'}, SWR = {46, 'tob', 'bto'},
LUI = {15, 'tj', '0ti'}, LUI = {15, 'ti', '0ti'},
MFHI = {0, 'd', '00d0C', 16}, MFHI = {0, 'd', '00d0C', 16},
MFLO = {0, 'd', '00d0C', 18}, MFLO = {0, 'd', '00d0C', 18},
@ -331,19 +330,50 @@ local instruction_handlers = {
BAL = {1, 'r', '0Co', 17}, BAL = {1, 'r', '0Co', 17},
CL = {0, 'd', '00d0C', 32}, CL = {0, 'd', '00d0C', 32},
MOV = {0, 'dt', '0td0C', 32}, MOV = {0, 'dt', '0td0C', 32},
MOVE = {0, 'dt', '0td0C', 32},
NEG = {0, 'ds', 's0d0C', 34},
NOP = {0, '', '0'}, NOP = {0, '', '0'},
NOR = {0, 'dst', 's0d0C', 39},
SUBI = {8, 'tsk', 'sti'}, SUBI = {8, 'tsk', 'sti'},
SUBIU = {9, 'tsk', 'sti'}, SUBIU = {9, 'tsk', 'sti'},
-- LUI only loads the lower 16 bits of its constant.
-- if you need the upper 16, use this instead.
LUUI = {15, 'tJ', '0ti'},
-- ...that expand to multiple instructions -- ...that expand to multiple instructions
LI = 'LI', -- only one instruction for values < 0x10000 LI = 'LI', -- only one instruction for values < 0x10000
LA = 'LA', LA = 'LA',
ABS = {}, -- BGEZ NOP SUB?
MUL = {}, -- MULT MFLO
--DIV = {}, -- 3 arguments
REM = {}, -- 3 arguments
NAND = {},
NANDI = {},
NORI = {},
ROL = {},
ROR = {},
SEQ = {},
SEQI = {},
SEQIU = {},
SEQU = {},
SGE = {},
SGEI = {},
SGEIU = {},
SGEU = {},
SGT = {},
SGTI = {},
SGTIU = {},
SGTU = {},
SLE = {},
SLEI = {},
SLEIU = {},
SLEU = {},
SNE = {},
SNEI = {},
SNEIU = {},
SNEU = {},
-- TODO: immediate, unsigned, likely versions?
BEQI = {}, BEQI = {},
BNEI = {}, BNEI = {},
BGE = {}, BGE = {},
@ -699,7 +729,6 @@ function Parser:register(t)
t = t or registers t = t or registers
if self.tt ~= 'REG' then if self.tt ~= 'REG' then
if self.tt == 'NUM' and self.tok == '0' then if self.tt == 'NUM' and self.tok == '0' then
-- i don't think cajeasm actually does this
self.tt = 'REG' self.tt = 'REG'
self.tok = 'R0' self.tok = 'R0'
else else
@ -830,7 +859,7 @@ function Parser:instruction()
if h == nil then if h == nil then
self:error('undefined instruction') self:error('undefined instruction')
elseif h == 'LI' or h == 'LA' then elseif h == 'LI' or h == 'LA' then
-- FIXME: this fails horribly with labels -- FIXME: probably breaks with defines
local lui = instruction_handlers['LUI'] local lui = instruction_handlers['LUI']
local addi = instruction_handlers['ADDI'] local addi = instruction_handlers['ADDI']
local ori = instruction_handlers['ORI'] local ori = instruction_handlers['ORI']
@ -838,6 +867,13 @@ function Parser:instruction()
args.rt = self:register() args.rt = self:register()
self:optional_comma() self:optional_comma()
local im = self:const() local im = self:const()
local is_label = type(im[2]) ~= 'number'
if h == 'LI' and is_label then
self:error('use LA for addresses')
end
if h == 'LA' and not is_label then
self:error('use LI for immediates')
end
if h == 'LA' or im[2] >= 0x10000 then if h == 'LA' or im[2] >= 0x10000 then
args.rs = args.rt args.rs = args.rt
args.immediate = {'UPPER', im} args.immediate = {'UPPER', im}