notwa/lips
1
0
Fork 0
mirror of https://github.com/notwa/lips synced 2024-11-14 22:49:02 -08:00
Code Issues Releases Wiki Activity

add JPOP pseudo-instruction

Browse source
This commit is contained in:
Connor Olding 2015-12-17 08:50:24 -08:00
parent dc4dac8138
commit 0edaa3f2de
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lips.lua
View file

@ -192,7 +192,7 @@ local instructions = {
SLTIU = {11, 'tsi', 'sti'}, SLTIU = {11, 'tsi', 'sti'},
XORI = {14, 'tsi', 'sti'}, XORI = {14, 'tsi', 'sti'},
ADD = {0, 'dst', 'std0C', 32}, ADD = {0, 'pseudodst', 'std0C', 32},
ADDU = {0, 'dst', 'std0C', 33}, ADDU = {0, 'dst', 'std0C', 33},
AND = {0, 'dst', 'std0C', 36}, AND = {0, 'dst', 'std0C', 36},
DADD = {0, 'dst', 'std0C', 44}, DADD = {0, 'dst', 'std0C', 44},
@ -391,6 +391,7 @@ local instructions = {
-- variable arguments -- variable arguments
PUSH = 'PUSH', PUSH = 'PUSH',
POP = 'POP', POP = 'POP',
JPOP = 'JPOP',
ABS = {}, -- BGEZ NOP SUB? ABS = {}, -- BGEZ NOP SUB?
MUL = {}, -- MULT MFLO MUL = {}, -- MULT MFLO
@ -1029,9 +1030,10 @@ function Parser:instruction()
self:format_out(lui[3], lui[1], args, lui[4], lui[5]) self:format_out(lui[3], lui[1], args, lui[4], lui[5])
args.immediate = {'LOWER', im} args.immediate = {'LOWER', im}
self:format_out(addiu[3], addiu[1], args, addiu[4], addiu[5]) self:format_out(addiu[3], addiu[1], args, addiu[4], addiu[5])
elseif h == 'PUSH' or h == 'POP' then elseif h == 'PUSH' or h == 'POP' or h == 'JPOP' then
local addi = instructions['ADDI'] local addi = instructions['ADDI']
local w = instructions[h == 'PUSH' and 'SW' or 'LW'] local w = instructions[h == 'PUSH' and 'SW' or 'LW']
local jr = instructions['JR']
local registers = {} local registers = {}
while not self:is_EOL() do while not self:is_EOL() do
local r = self:register() local r = self:register()
@ -1061,7 +1063,11 @@ function Parser:instruction()
self:format_out(w[3], w[1], args, w[4], w[5]) self:format_out(w[3], w[1], args, w[4], w[5])
end end
end end
if h == 'POP' then if h == 'JPOP' then
args.rs = 'RA'
self:format_out(jr[3], jr[1], args, jr[4], jr[5])
end
if h == 'POP' or h == 'JPOP' then
args.rt = 'SP' args.rt = 'SP'
args.rs = 'SP' args.rs = 'SP'
args.immediate = {'NUM', #registers*4} args.immediate = {'NUM', #registers*4}