CPU operation should now mostly do 0 allocations.

ExpandingMan · May 30, 2017 · c4fcf60 · c4fcf60
1 parent f7e617a
commit c4fcf60
Show file tree

Hide file tree

Showing 4 changed files with 260 additions and 281 deletions.
diff --git a/src/boilerplate.jl b/src/boilerplate.jl
@@ -6,13 +6,16 @@ Here we keep some macros for doing boilerplate code generation...
 opfuncname(opcode::UInt8) = Symbol(string("op", hexstring(opcode), "!"))
 opstring(fname::Symbol) = strip(string(fname), '!')
 
-assemblydict(opname::Symbol, opcode::UInt8) = :(ASSEMBLY_DICT[$(opstring(opname))] = $opcode)
+function assemblydict(opname::Symbol, mode::Symbol, opcode::UInt8)
+    :(ASSEMBLY_DICT[($(opstring(opname)),$(QuoteNode(mode)))] = $opcode)
+end
 
 
 function opdict(opcode::UInt8, nbytes::Int, ncycles::Int)
     :(OPCODES[$opcode] = ($(opfuncname(opcode)), $nbytes, $ncycles))
 end
 
+
 function opdef_Implicit(opname::Symbol, opcode::UInt8)
     fname = opfuncname(opcode)
     quote
@@ -30,63 +33,63 @@ end
 function opdef_ZeroPage(opname::Symbol, opcode::UInt8)
     fname = opfuncname(opcode)
     quote
-        $fname(cs::Chipset, bytes::AbstractVector{UInt8}) = $opname(cs.cpu, cs.ram, Π8(bytes))
+        $fname(cs::Chipset) = $opname(cs.cpu, cs.ram, Π8(opargs(cs, 1)))
     end
 end
 
 function opdef_ZeroPageX(opname::Symbol, opcode::UInt8)
     fname = opfuncname(opcode)
     quote
-        $fname(cs::Chipset, bytes::AbstractVector{UInt8}) = $opname(cs.cpu, cs.ram, DirectX, Π8(bytes))
+        $fname(cs::Chipset) = $opname(cs.cpu, cs.ram, DirectX, Π8(opargs(cs, 1)))
     end
 end
 
 function opdef_ZeroPageY(opname::Symbol, opcode::UInt8)
     fname = opfuncname(opcode)
     quote
-        $fname(cs::Chipset, bytes::AbstractVector{UInt8}) = $opname(cs.cpu, cs.ram, DirectY, Π8(bytes))
+        $fname(cs::Chipset) = $opname(cs.cpu, cs.ram, DirectY, Π8(opargs(cs, 1)))
     end
 end
 
 function opdef_Absolute(opname::Symbol, opcode::UInt8)
     fname = opfuncname(opcode)
     quote
-        $fname(cs::Chipset, bytes::AbstractVector{UInt8}) = $opname(cs.cpu, cs.ram, Direct, Π16(bytes))
+        $fname(cs::Chipset) = $opname(cs.cpu, cs.ram, Direct, Π16(opargs(cs,1), opargs(cs,2)))
     end
 end
 
 function opdef_AbsoluteX(opname::Symbol, opcode::UInt8)
     fname = opfuncname(opcode)
     quote
-        $fname(cs::Chipset, bytes::AbstractVector{UInt8}) = $opname(cs.cpu, cs.ram, DirectX, Π16(bytes))
+        $fname(cs::Chipset) = $opname(cs.cpu, cs.ram, DirectX, Π16(opargs(cs,1), opargs(cs,2)))
     end
 end
 
 function opdef_AbsoluteY(opname::Symbol, opcode::UInt8)
     fname = opfuncname(opcode)
     quote
-        $fname(cs::Chipset, bytes::AbstractVector{UInt8}) = $opname(cs.cpu, cs.ram, DirectY, Π16(bytes))
+        $fname(cs::Chipset) = $opname(cs.cpu, cs.ram, DirectY, Π16(opargs(cs,1), opargs(cs,2)))
     end
 end
 
 function opdef_Indirect(opname::Symbol, opcode::UInt8)
     fname = opfuncname(opcode)
     quote
-        $fname(cs::Chipset, bytes::AbstractVector{UInt8}) = $opname(cs.cpu, cs.ram, Indirect, Π16(bytes))
+        $fname(cs::Chipset) = $opname(cs.cpu, cs.ram, Indirect, Π16(opargs(cs,1), opargs(cs,2)))
     end
 end
 
 function opdef_IndirectX(opname::Symbol, opcode::UInt8)
     fname = opfuncname(opcode)
     quote
-        $fname(cs::Chipset, bytes::AbstractVector{UInt8}) = $opname(cs.cpu, cs.ram, IndirectX, Π8(bytes))
+        $fname(cs::Chipset) = $opname(cs.cpu, cs.ram, IndirectX, Π8(opargs(cs,1)))
     end
 end
 
 function opdef_IndirectY(opname::Symbol, opcode::UInt8)
     fname = opfuncname(opcode)
     quote
-        $fname(cs::Chipset, bytes::AbstractVector{UInt8}) = $opname(cs.cpu, cs.ram, IndirectY, Π8(bytes))
+        $fname(cs::Chipset) = $opname(cs.cpu, cs.ram, IndirectY, Π8(opargs(cs,1)))
     end
 end
 
@@ -132,7 +135,7 @@ macro opdef(opname::Symbol, defblock::Expr)
     defs = [tuple(ex.args...) for ex ∈ defs]
     funcdefs = [opdef(d[1], opname, d[2]) for d ∈ defs]
     dictries = [opdict(d[2], d[3], d[4]) for d ∈ defs]
-    assemblies = [assemblydict(opname, d[2]) for d ∈ defs]
+    assemblies = [assemblydict(opname, d[1], d[2]) for d ∈ defs]
     esc(quote
         $(funcdefs...)
         $(dictries...)

diff --git a/src/memory.jl b/src/memory.jl
@@ -28,7 +28,8 @@ export Π8, Π16
 
 Π8(x::AbstractVector{UInt8}) = Π{UInt8}(x[1])
 
-Π16(x::AbstractVector{UInt8}) = Π{UInt16}(bincat(x[1], x[2]))
+Π16(x::UInt8, y::UInt8) = Π{UInt16}(bincat(x, y))
+Π16(x::AbstractVector{UInt8}) = Π16(x[1], x[2])
 
 
 reset!(m::Memory) = (m.v .= zeros(UInt8, length(m.v)))