# HG changeset patch # User Robert McIntyre # Date 1334159247 18000 # Node ID 1f14c1b8af7e0f65fcbdb56bc3455402cd6aec2e # Parent 7c89fe478de4ef60850cffa2f9e8fc9623cd71fc working on main bootstrap program diff -r 7c89fe478de4 -r 1f14c1b8af7e clojure/com/aurellem/exp/item_bridge.clj --- a/clojure/com/aurellem/exp/item_bridge.clj Wed Apr 11 09:14:51 2012 -0500 +++ b/clojure/com/aurellem/exp/item_bridge.clj Wed Apr 11 10:47:27 2012 -0500 @@ -41,30 +41,6 @@ ;; (almost-broken 20) more or less works -(defn capture-program-counter - "records the program counter for each tick" - [^SaveState state ticks] - (let [i (atom 0)] - (reduce (fn [[program-counters state] _] - (println (swap! i inc)) - [(conj program-counters (PC state)) - (tick state)]) - [[] state] - (range ticks)))) - - -(defn capture-program-counter - [^SaveState state ticks] - (tick state) - - (loop [i 0 - pcs []] - (if (= i ticks) - (filter (partial < 0x2000)(sort (set pcs))) - (do - (com.aurellem.gb.Gb/tick) - (recur (inc i) - (conj pcs (first (registers)))))))) (defn loop-program [] [0x00 ;0xD31D ;; disable-interrupts diff -r 7c89fe478de4 -r 1f14c1b8af7e clojure/com/aurellem/gb/constants.clj --- a/clojure/com/aurellem/gb/constants.clj Wed Apr 11 09:14:51 2012 -0500 +++ b/clojure/com/aurellem/gb/constants.clj Wed Apr 11 10:47:27 2012 -0500 @@ -9,4 +9,6 @@ (def pokemon-record-begin 0xD162) (def pokemon-record-end 0xD2F5) -(def D-memory-end 0xD41B) \ No newline at end of file +(def D-memory-end 0xD41B) + +(def pokemon-list-start 0xD162) \ No newline at end of file diff -r 7c89fe478de4 -r 1f14c1b8af7e clojure/com/aurellem/gb/dylan_assembly.clj --- a/clojure/com/aurellem/gb/dylan_assembly.clj Wed Apr 11 09:14:51 2012 -0500 +++ b/clojure/com/aurellem/gb/dylan_assembly.clj Wed Apr 11 10:47:27 2012 -0500 @@ -1,7 +1,7 @@ (ns com.aurellem.gb.dylan-assembly "A much more compact version of write-memory-assembly" {:author "Dylan Holmes"} - (:use (com.aurellem.gb gb-driver assembly util)) + (:use (com.aurellem.gb gb-driver assembly util vbm)) (:import [com.aurellem.gb.gb_driver SaveState])) ;; Specs for main bootstrap program @@ -231,24 +231,65 @@ (IE! 0) (inject-item-assembly (write-memory-assembly-compact)))) -(defn drive-compact [] - (-> (write-mem-compact) - (#(do (println "memory from 0xC00F to 0xC01F:" - (subvec (vec (memory %)) 0xC00F 0xC01F)) %)) - (step []) ; make sure it can handle blanks - (step []) ; at the beginning. - (step []) - (step [:start]) ; - (step [:select]) - (step [:u :d]) - (step [:a :b :start :select]) - (step [:a]) - (step [:b]) - (step [:a :b]) - (step [:select]) - (step []) - (step []) - (step []) - (#(do (println "memory from 0xC00F to 0xC01F:" - (subvec (vec (memory %)) 0xC00F 0xC01F)) %)))) +(defn test-write-bytes-mode [] + (let [target-address 0xD135 + [target-high target-low] (disect-bytes-2 target-address) + assembly [0xF3 0x18 0xFE 0x12] + get-mem-region #(subvec (vec (memory %)) + target-address (+ target-address 20)) + before (write-mem-compact) + after + (-> before + (step []) ; make sure it can handle blanks + (step []) ; at the beginning. + (step []) + (step [:start]) ; select WRITE-BYTES mode + (step (buttons 4)) ; write 4 bytes + (step (buttons target-high)) + (step (buttons target-low)) + (step (buttons (nth assembly 0))) + (step (buttons (nth assembly 1))) + (step (buttons (nth assembly 2))) + (step (buttons (nth assembly 3))) + (step []) + (step []) + (step []))] + (println "before :" (get-mem-region before)) + (println "after :" (get-mem-region after)) + (assert (= assembly (take 4 (get-mem-region after)))) + after)) +(defn test-jump-mode [] + (let [target-address 0xC01F + [target-high target-low] (disect-bytes-2 target-address) + post-jump + (-> (test-write-bytes-mode) + (step []) + (step []) + (step []) + (step (buttons 0xFF)) ; Select JUMP mode. + (step (buttons target-high)) + (step (buttons target-low))) + program-counters + (capture-program-counter + post-jump + 10000)] + (println program-counters) + (assert (contains? (set program-counters) target-address)) + post-jump)) + + +(defn test-loop [] + (contains? + (set + (capture-program-counter + (-> (mid-game) + ;; (IE! 0) + (set-memory-range 0xD135 [0xF3 0x18 0xFE]) + (PC! 0xD135)) 10000)) + 0xD136)) + + + + + \ No newline at end of file diff -r 7c89fe478de4 -r 1f14c1b8af7e clojure/com/aurellem/gb/rlm_assembly.clj --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/clojure/com/aurellem/gb/rlm_assembly.clj Wed Apr 11 10:47:27 2012 -0500 @@ -0,0 +1,122 @@ +(ns com.aurellem.gb.rlm-assembly + "Version of main bootstrap program that is valid output for the + item-writer program." + (:use (com.aurellem.gb gb-driver assembly util vbm constants)) + (:use (com.aurellem.run bootstrap-1)) + (:import [com.aurellem.gb.gb_driver SaveState])) + +;; Specs for Main Bootstrap Program + +;; Number-Input +;; Number input works using all eight buttons to +;; spell out an 8 bit number. The order of buttons is +;; [:d :u :l :r :start :select :b :a] --> 11111111 +;; [ :l :start :a] --> 00101001 + +;;; MODE-SELECT +;; The bootstrap program starts in MODE-SELECT mode. +;; MODE-SELECT transitions to one of three modes depending +;; on which buttons are pressed: +;; 0 (no-buttons) : MODE-SELECT +;; 8 [:start] : WRITE-BYTES +;; 0xFF (all-buttons) : JUMP + +;;; WRITE-BYTES + +;; WRITE-BYTES mode writes sequences of arbitray values to +;; arbitray memory locations. It expects you to enter a +;; header of three bytes describing what to write: + +;; Byte 0 : Number of Bytes to Write +;; Byte 1 : Start Address High Byte +;; Byte 1 : Start Address Low Byte + +;; Then, you enter the number of bytes specified in Byte 0 +;; they are written to the start address in +;; sequence. After the last byte is written control +;; returns to MODE-SELECT mode. + +;; Example: to write the sequence [1 2 3 4] starting at +;; address 0xC01F enter +;; Byte 0 : 4 (will write four bytes) +;; Byte 1 : 0xC0 (high byte of 0xC01F) +;; Byte 2 : 0x1F (low byte of 0xC01F) +;; Byte 3 : 1 (write 1 to 0xC01F) +;; Byte 4 : 2 (write 2 to 0xC020) +;; Byte 5 : 3 (write 3 to 0xC021) +;; Byte 6 : 4 (write 4 to 0xC022) + +;;; JUMP +;; JUMP mode jumps program control to any arbitray +;; location. It expects you to enter two bytes which +;; correspond to the high and low bytes of the memory +;; address to which you want to jump. +;; Byte 0 : Jump Address High Byte +;; Byte 1 : Jump Address Low Byte + +;; Example: to jump to address 0x1234 enter +;; Byte 0 : 0x12 (high byte of 0x1234) +;; Byte 1 : 0x34 (low byte of 0x1234) + + + +(defn main-bootstrap-program [start-address] + (let [[start-high start-low] (disect-bytes-2 start-address)] + [0xF3 0x18 0xFE])) + +;;;;;; TESTS ;;;;;; + +(defn bootstrap-base [] + (let [program (main-bootstrap-program pokemon-list-start)] + ;; make sure program is valid output for item-writer + (bootstrap-pattern program) + (-> (tick (mid-game)) + (set-memory-range pokemon-list-start program) + (PC! pokemon-list-start)))) + +(defn test-write-bytes-mode [] + (let [target-address 0xC00F + [target-high target-low] (disect-bytes-2 target-address) + assembly [0xF3 0x18 0xFE 0x12] + get-mem-region #(subvec (vec (memory %)) + target-address (+ target-address 20)) + before (bootstrap-base) + after + (-> before + (step []) ; make sure it can handle blanks + (step []) ; at the beginning. + (step []) + (step [:start]) ; select WRITE-BYTES mode + (step (buttons 4)) ; write 4 bytes + (step (buttons target-high)) + (step (buttons target-low)) + (step (buttons (nth assembly 0))) + (step (buttons (nth assembly 1))) + (step (buttons (nth assembly 2))) + (step (buttons (nth assembly 3))) + (step []) + (step []) + (step []))] + (println "before :" (get-mem-region before)) + (println "after :" (get-mem-region after)) + (assert (= assembly (take 4 (get-mem-region after)))) + after)) + +(defn test-jump-mode [] + (let [target-address 0xC00F + [target-high target-low] (disect-bytes-2 target-address) + post-jump + (-> (test-write-bytes-mode) + (step []) + (step []) + (step []) + (step (buttons 0xFF)) ; Select JUMP mode. + (step (buttons target-high)) + (step (buttons target-low))) + program-counters + (capture-program-counter + post-jump + 10000)] + (println program-counters) + (assert (contains? (set program-counters) target-address)) + post-jump)) diff -r 7c89fe478de4 -r 1f14c1b8af7e clojure/com/aurellem/gb/util.clj --- a/clojure/com/aurellem/gb/util.clj Wed Apr 11 09:14:51 2012 -0500 +++ b/clojure/com/aurellem/gb/util.clj Wed Apr 11 10:47:27 2012 -0500 @@ -252,4 +252,31 @@ (if (bit-test n 7) (- lower-seven 128) lower-seven))) - \ No newline at end of file + + +(defn capture-program-counter + "records the program counter for each tick" + [^SaveState state ticks] + (let [i (atom 0)] + (reduce (fn [[program-counters state] _] + (swap! i inc) + (if (= (rem @i 1000) 0) (println @i)) + [(conj program-counters (PC state)) + (tick state)]) + [[] state] + (range ticks)))) + +(defn capture-program-counter + "Records the program counter for each tick" + [^SaveState state ticks] + (tick state) + + (loop [i 0 + pcs []] + (if (= i ticks) + (filter (partial < 0x2000)(sort (set pcs))) + (do + (com.aurellem.gb.Gb/tick) + (recur (inc i) + (conj pcs (first (registers)))))))) + diff -r 7c89fe478de4 -r 1f14c1b8af7e clojure/com/aurellem/run/bootstrap_1.clj --- a/clojure/com/aurellem/run/bootstrap_1.clj Wed Apr 11 09:14:51 2012 -0500 +++ b/clojure/com/aurellem/run/bootstrap_1.clj Wed Apr 11 10:47:27 2012 -0500 @@ -1,5 +1,5 @@ (ns com.aurellem.run.bootstrap-1 - (:use (com.aurellem.gb saves gb-driver util + (:use (com.aurellem.gb saves gb-driver util constants items vbm characters money)) (:use (com.aurellem.run util title save-corruption bootstrap-0)) (:use (com.aurellem.exp item-bridge)) @@ -8,7 +8,7 @@ (defn pc-item-writer-program [] (let [limit 201 - [target-high target-low] (disect-bytes-2 0xD162)] + [target-high target-low] (disect-bytes-2 pokemon-list-start)] (flatten [[0x00 ;; (item-hack) set increment stack pointer no-op 0x1E ;; load limit into E