From bf439cafb378ae3d72ba5ef7df88b744f047c004 Mon Sep 17 00:00:00 2001
From: Connor Olding <cloningdonor@gmail.com>
Date: Thu, 21 Apr 2016 02:09:58 -0700
Subject: [PATCH] cleanup some dead code

---
 lips/Dumper.lua | 78 -------------------------------------------------
 lips/Parser.lua | 57 ------------------------------------
 2 files changed, 135 deletions(-)

diff --git a/lips/Dumper.lua b/lips/Dumper.lua
index 9ab4fab..9578480 100644
--- a/lips/Dumper.lua
+++ b/lips/Dumper.lua
@@ -39,55 +39,6 @@ function Dumper:advance(by)
     self.pos = self.pos + by
 end
 
---[[
-function Dumper:add_directive(fn, line, name, a, b)
-    self.fn = fn
-    self.line = line
-    local t = {}
-    t.fn = self.fn
-    t.line = self.line
-    if name == 'BYTE' then
-    elseif name == 'HALFWORD' then
-    elseif name == 'WORD' then
-        if type(a) == 'string' then
-            t.kind = 'label'
-            t.name = a
-            insert(self.commands, t)
-            self:advance(4)
-        end
-    elseif name == 'ORG' then
-        t.kind = 'goto'
-        t.addr = a
-        insert(self.commands, t)
-        self.pos = a
-        self:advance(0)
-    elseif name == 'ALIGN' then
-        t.kind = 'ahead'
-        local align
-        if a == 0 then
-            align = 4
-        elseif a < 0 then
-            self:error('negative alignment')
-        else
-            align = 2^a
-        end
-        local temp = self.pos + align - 1
-        t.skip = temp - (temp % align) - self.pos
-        t.fill = b and b % 0x100 or 0
-        insert(self.commands, t)
-        self:advance(t.skip)
-    elseif name == 'SKIP' then
-        t.kind = 'ahead'
-        t.skip = a
-        t.fill = b and b % 0x100 or nil
-        insert(self.commands, t)
-        self:advance(t.skip)
-    else
-        self:error('unimplemented directive')
-    end
-end
---]]
-
 function Dumper:desym(t)
     if t.tt == 'REL' then
         local target = t.tok % 0x80000000
@@ -335,14 +286,6 @@ function Dumper:assemble(s)
     local name = s.type
     local h = data.instructions[name]
     self.s = s
---    if overrides[name] then
---        --overrides[name](self, name)
---        local s = Statement(self.fn, self.line, '!DATA') -- FIXME: dummy
---        return s
---    elseif h[2] == 'tob' then -- TODO: or h[2] == 'Tob' then
---        local s = Statement(self.fn, self.line, '!DATA') -- FIXME: dummy
---        return s
---    elseif h[2] ~= nil then
     if h[2] ~= nil then
         local args = self:format_in(h[2])
         return self:format_out(h, args)
@@ -500,27 +443,6 @@ function Dumper:dump()
             self.pos = s[1].tok
         end
     end
-
-    --[[
-        elseif t.kind == 'goto' then
-            self.pos = t.addr
-        elseif t.kind == 'ahead' then
-            if t.fill then
-                for i=1, t.skip do
-                    self:write{t.fill}
-                end
-            else
-                self.pos = self.pos + t.skip
-            end
-        elseif t.kind == 'label' then
-            local val = self:desym{tt='LABELSYM', tok=t.name}
-            val = (val % 0x80000000) + 0x80000000
-            local b0 = bitrange(val, 0, 7)
-            local b1 = bitrange(val, 8, 15)
-            local b2 = bitrange(val, 16, 23)
-            local b3 = bitrange(val, 24, 31)
-            self:write{b3, b2, b1, b0}
-    --]]
 end
 
 return Dumper
diff --git a/lips/Parser.lua b/lips/Parser.lua
index 5ed53bb..9bcd08c 100644
--- a/lips/Parser.lua
+++ b/lips/Parser.lua
@@ -17,63 +17,6 @@ function Parser:init(writer, fn, options)
     self.options = options or {}
 end
 
---[[
-function Parser:instruction()
-    local name = self.tok
-    local h = data.instructions[name]
-    assert(h, 'Internal Error: undefined instruction')
-    self:advance()
-
-    if overrides[name] then
-        overrides[name](self, name)
-    elseif h[2] == 'tob' then -- TODO: or h[2] == 'Tob' then
-        -- handle all the addressing modes for lw/sw-like instructions
-        local lui = data.instructions['LUI']
-        local addu = data.instructions['ADDU']
-        local args = {}
-        args.rt = self:register()
-        self:optional_comma()
-        if self.tt == 'OPEN' then
-            args.offset = 0
-            args.base = self:deref()
-        else -- NUM or LABELSYM
-            local lui_args = {}
-            local addu_args = {}
-            local o = self:const()
-            if self.tt == 'NUM' then
-                o:set('offset', self:const().tok)
-            end
-            args.offset = self:token(o)
-            if not o.portion then
-                args.offset:set('portion', 'lower')
-            end
-            -- attempt to use the fewest possible instructions for this offset
-            if not o.portion and (o.tt == 'LABELSYM' or o.tok >= 0x80000000) then
-                lui_args.immediate = Token(o):set('portion', 'upperoff')
-                lui_args.rt = 'AT'
-                self:format_out(lui, lui_args)
-                if not self:is_EOL() then
-                    addu_args.rd = 'AT'
-                    addu_args.rs = 'AT'
-                    addu_args.rt = self:deref()
-                    self:format_out(addu, addu_args)
-                end
-                args.base = 'AT'
-            else
-                args.base = self:deref()
-            end
-        end
-        self:format_out(h, args)
-    elseif h[2] ~= nil then
-        local args = self:format_in(h[2])
-        self:format_out(h, args)
-    else
-        self:error('unimplemented instruction')
-    end
-    self:expect_EOL()
-end
---]]
-
 function Parser:tokenize(asm)
     local lexer = Lexer(asm, self.main_fn, self.options)
     local tokens = {}