now compiles on 1.0

ExpandingMan · Aug 23, 2018 · b51efed · b51efed
1 parent 7f71451
commit b51efed
Show file tree

Hide file tree

Showing 10 changed files with 159 additions and 172 deletions.
diff --git a/REQUIRE b/REQUIRE
@@ -1,3 +1,3 @@
-julia 0.6
+julia 1.0
 MacroTools
 FunctionWrappers
diff --git a/src/Sim6502.jl b/src/Sim6502.jl
@@ -1,16 +1,8 @@
-__precompile__(true)
-
-# Note that I expect to use `import` instead of `using` when making the NES emulator
-
 module Sim6502
 
 using MacroTools
 
-import FunctionWrappers: FunctionWrapper
-
-import Base.fetch
-import Base.pointer
-import Base: +, -
+using FunctionWrappers: FunctionWrapper
 
 include("utils.jl")
 include("cpu.jl")
@@ -21,4 +13,26 @@ include("chipset.jl")
 include("opcodes.jl")
 include("assembler.jl")
 
+export CPU, fetch, store!, counter!, describe, status, status!, status_string
+export Memory, Π, Π8, Π16, reset!, dereference, deref, ↦, ⇾, store!
+export Chipset
+
+export AddressingMode, DirectMode, IndirectMode, Direct, DirectX, DirectY, IndirectX,
+    IndirectY
+
+export op!, tick!, @assemble
+
+
+# these are all instruction pieces which probably shouldn't be exported
+export ld!, lda!, ldx!, ldy!, st!, sta!, stx!, sty!, t!, tax!, tay!, txa!, tya!,
+    tsx!, txs!, pha!, php!, pla!, plp!
+export and!, eor!, ora!, bit!, adc!, sbc!, compare!, cmp!, cpx!, cpy!
+export increment!, inc!, inx!, iny!, decrement!, dec!, dex!, dey!
+export arithmetic_shiftleft!, asl!, logical_shiftright!, lsr!, rotateleft!, rol!,
+    rotateright!, ror!
+export jmp!, jsr!, rts!
+export bcc!, bcs!, beq!, bmi!, bne!, bpl!, bvc!, bvs!
+export clc!, cld!, cli!, clv!, sec!, sed!, sei!, brk!, nop!, rti!
+
+
 end # module
diff --git a/src/assembler.jl b/src/assembler.jl
@@ -33,7 +33,7 @@ end
 
 _assembly_lookup(op::String, mode::Symbol) = ASSEMBLY_DICT[(op,mode)]
 
-_assembly_args(::Void) = nothing
+_assembly_args(::Nothing) = nothing
 _assembly_args(x::UInt8) = x
 _assembly_args(x::UInt16) = reinterpret(UInt8, [x])
 
@@ -51,7 +51,7 @@ end
 
 
 macro assemble(block::Expr)
-    program = Vector{UInt8}()  # for now we'll dynamically allocate
+    program = Vector{UInt8}(undef)  # for now we'll dynamically allocate
     if @capture(block, begin instrs__ end)
         for instr ∈ instrs
             assemble!(program, instr)
@@ -61,4 +61,3 @@ macro assemble(block::Expr)
     end
     :($program)
 end
-export @assemble
diff --git a/src/boilerplate.jl b/src/boilerplate.jl
@@ -1,6 +1,6 @@
-#===================================================================================================
+#==============================================================================================
 Here we keep some macros for doing boilerplate code generation...
-===================================================================================================#
+==============================================================================================#
 # TODO deal with page crossings!!!
 
 opfuncname(opcode::UInt8) = Symbol(string("op", hexstring(opcode), "!"))

diff --git a/src/chipset.jl b/src/chipset.jl
@@ -18,15 +18,13 @@ mutable struct Chipset
     δt::Float64
 
     clock::Int64
-
-    Chipset(c::CPU, m::Memory, δt::AbstractFloat) = new(c, m, δt, 0)
-    Chipset(c::CPU, m::Memory) = Chipset(c, m, NES_CLOCK_PERIOD)
-    Chipset() = Chipset(CPU(), Memory())
 end
-export Chipset
 
 
-# this is a nu, not a v
+Chipset(c::CPU, m::Memory, δt::AbstractFloat) = new(c, m, δt, 0)
+Chipset(c::CPU, m::Memory) = Chipset(c, m, NES_CLOCK_PERIOD)
+Chipset() = Chipset(CPU(), Memory())
+
 ν(cs::Chipset) = 1.0/cs.δt
 ω(cs::Chipset) = 2π/cs.δt
 

diff --git a/src/cpu.jl b/src/cpu.jl
@@ -13,10 +13,10 @@ mutable struct FlagsRegister
     Ω::Bool
     V::Bool
     N::Bool
-
-    FlagsRegister() = new(false, false, false, false, false, false, false, false)
 end
 
+FlagsRegister() = new(false, false, false, false, false, false, false, false)
+
 
 mutable struct CPU
     A::UInt8  # accumulator register
@@ -31,16 +31,13 @@ mutable struct CPU
         new(A, X, Y, SP, PC, flags)
     end
 end
-export CPU
 
 
-@inline fetch(c::CPU, reg::Symbol) = getfield(c, reg)
+
+@inline Base.fetch(c::CPU, reg::Symbol) = getfield(c, reg)
 @inline store!(c::CPU, reg::Symbol, val::Integer) = setfield!(c, reg, val)
-export fetch, store!
 
 counter!(c::CPU, ℓ::Unsigned) = (c.PC += ℓ)
-export counter!
-
 
 
 function describe(c::CPU)
@@ -56,15 +53,13 @@ function describe(c::CPU)
                 $st
     """
 end
-export describe
 
-import Base.show
 Base.show(io::IO, c::CPU) = print(describe(c))
 
 
-#===================================================================================================
+#==============================================================================================
     <status register access>
-===================================================================================================#
+==============================================================================================#
 status(fr::FlagsRegister, flag::Symbol)::Bool = getfield(fr, flag)
 status(c::CPU, flag::Symbol)::Bool = getfield(fr, flag)
 
@@ -80,17 +75,16 @@ function status_string(fr::FlagsRegister)
 end
 status_string(c::CPU) = status_string(c.flags)
 
-export status, status!, status_string
-#===================================================================================================
+#==============================================================================================
     </status register access>
-===================================================================================================#
+==============================================================================================#
 
 
-#===================================================================================================
+#==============================================================================================
     <special pointers>
-===================================================================================================#
+==============================================================================================#
 stackpointer(c::CPU) = Π(STACK_PAGE + c.SP)
-#===================================================================================================
+#==============================================================================================
     </special pointers>
-===================================================================================================#
+==============================================================================================#