diff options
| -rw-r--r-- | mu.arc | 53 | ||||
| -rw-r--r-- | trace.mu | 192 |
2 files changed, 244 insertions, 1 deletions
diff --git a/mu.arc b/mu.arc index 5d81a7b8..0f13344d 100644 --- a/mu.arc +++ b/mu.arc @@ -156,6 +156,7 @@ string-address-address (obj size 1 address t elem '(string-address)) string-address-array (obj array t elem '(string-address)) string-address-array-address (obj size 1 address t elem '(string-address-array)) + string-address-array-address-address (obj size 1 address t elem '(string-address-array-address)) character (obj size 1) ; int32 like a Go rune character-address (obj size 1 address t elem '(character)) ; a buffer makes it easy to append to a string/array @@ -164,6 +165,9 @@ ; so for example, 'print-string' won't work on it. buffer (obj size 2 and-record t elems '((integer) (string-address)) fields '(length data)) buffer-address (obj size 1 address t elem '(buffer)) + ; a stream makes it easy to read from a string/array + stream (obj size 2 and-record t elems '((integer) (string-address)) fields '(pointer data)) + stream-address (obj size 1 address t elem '(stream)) ; isolating function calls space (obj array t elem '(location)) ; by convention index 0 points to outer space space-address (obj size 1 address t elem '(space)) @@ -2192,6 +2196,53 @@ (reply result:string-address) ) +(init-fn init-stream + (default-space:space-address <- new space:literal 30:literal) + (in:string-address <- next-input) + (result:stream-address <- new stream:literal) + (x:integer-address <- get-address result:stream-address/deref pointer:offset) + (x:integer-address/deref <- copy 0:literal) + (y:string-address-address <- get-address result:stream-address/deref data:offset) + (y:string-address-address/deref <- copy in:string-address) + (reply result:stream-address) +) + +(init-fn read-line + (default-space:space-address <- new space:literal 30:literal) + (in:stream-address <- next-input) + (idx:integer-address <- get-address in:stream-address/deref pointer:offset) + (s:string-address <- get in:stream-address/deref data:offset) +;? ($print (("idx before: " literal))) ;? 1 +;? ($print idx:integer-address/deref) ;? 1 +;? ($print (("\n" literal))) ;? 1 + (next-idx:integer <- find-next s:string-address ((#\newline literal)) idx:integer-address/deref) +;? ($print (("next-idx: " literal))) ;? 1 +;? ($print next-idx:integer) ;? 1 +;? ($print (("\n" literal))) ;? 1 + (result:string-address <- string-copy s:string-address idx:integer-address/deref next-idx:integer) + (idx:integer-address/deref <- add next-idx:integer 1:literal) ; skip newline +;? ($print (("idx now: " literal))) ;? 1 +;? ($print idx:integer-address/deref) ;? 1 +;? ($print (("\n" literal))) ;? 1 + (reply result:string-address) +) + +(init-fn end-of-stream? + (default-space:space-address <- new space:literal 30:literal) + (in:stream-address <- next-input) + (idx:integer <- get in:stream-address/deref pointer:offset) + (s:string-address <- get in:stream-address/deref data:offset) + (len:integer <- length s:string-address/deref) +;? ($print (("eos: " literal))) ;? 1 +;? ($print len:integer) ;? 1 +;? ($print (("\n" literal))) ;? 1 +;? ($print (("idx: " literal))) ;? 1 +;? ($print idx:integer) ;? 1 +;? ($print (("\n" literal))) ;? 1 + (result:boolean <- greater-or-equal idx:integer len:integer) + (reply result:boolean) +) + (init-fn init-keyboard (default-space:space-address <- new space:literal 30:literal) (result:keyboard-address <- new keyboard:literal) @@ -2700,7 +2751,7 @@ ;? (= dump-trace* (obj whitelist '("schedule"))) ;? (= dump-trace* (obj whitelist '("run" "continuation"))) ;? 1 ;? (= dump-trace* (obj whitelist '("cn0" "cn1"))) -;? (set dump-trace*) ;? 5 +;? (set dump-trace*) ;? 7 ;? (freeze function*) ;? (prn function*!factorial) (run 'main) diff --git a/trace.mu b/trace.mu new file mode 100644 index 00000000..a419f173 --- /dev/null +++ b/trace.mu @@ -0,0 +1,192 @@ +(and-record trace [ + label:string-address + contents:string-address +]) +(address trace-address (trace)) +(array trace-address-array (trace-address)) +(address trace-address-array-address (trace-address-array)) +(address trace-address-array-address-address (trace-address-array-address)) + +(and-record instruction-trace [ + call-stack:string-address-array-address + pc:string-address ; should be integer? + instruction:string-address + children:trace-address-array-address +]) +(address instruction-trace-address (instruction-trace)) +(array instruction-trace-address-array (instruction-trace-address)) +(address instruction-trace-address-array-address (instruction-trace-address-array)) + +(function parse-traces [ ; stream-address -> instruction-trace-address-array-address + (default-space:space-address <- new space:literal 30:literal) +;? ($print (("parse-traces\n" literal))) ;? 1 + (in:stream-address <- next-input) + (result:buffer-address <- init-buffer 30:literal) + (curr-tail:instruction-trace-address <- copy nil:literal) + (ch:buffer-address <- init-buffer 5:literal) ; accumulator for traces between instructions + (run:string-address/const <- new "run") + ; reading each line from 'in' + { begin + next-line + (done?:boolean <- end-of-stream? in:stream-address) +;? ($print done?:boolean) ;? 1 +;? ($print (("\n" literal))) ;? 1 + (break-if done?:boolean) + ; parse next line as a generic trace + (line:string-address <- read-line in:stream-address) +;? (print-string nil:literal/terminal line:string-address) ;? 1 + (f:trace-address <- parse-trace line:string-address) + (l:string-address <- get f:trace-address/deref label:offset) + { begin + ; if it's an instruction trace with label 'run' + (inst?:boolean <- string-equal l:string-address run:string-address/const) + (break-unless inst?:boolean) + ; add accumulated traces to curr-tail + { begin + (break-unless curr-tail:instruction-trace-address) + (c:trace-address-array-address-address <- get-address curr-tail:instruction-trace-address/deref children:offset) + (c:trace-address-array-address-address/deref <- to-array ch:buffer-address) + } + ; append a new curr-tail to result + (curr-tail:instruction-trace-address <- parse-instruction-trace f:trace-address) + (result:buffer-address <- append result:buffer-address curr-tail:instruction-trace-address) + (jump next-line:offset) ; loop + } + ; otherwise accumulate trace + (loop-unless curr-tail:instruction-trace-address) + (ch:buffer-address <- append ch:buffer-address f:trace-address) + (loop) + } + ; add accumulated traces to final curr-tail + ; todo: test + { begin + (break-unless curr-tail:instruction-trace-address) + (c:trace-address-array-address-address <- get-address curr-tail:instruction-trace-address/deref children:offset) + (c:trace-address-array-address-address/deref <- to-array ch:buffer-address) + } + (s:instruction-trace-address-array-address <- to-array result:buffer-address) + (reply s:instruction-trace-address-array-address) +]) + +(function parse-instruction-trace [ ; trace-address -> instruction-trace-address + (default-space:space-address <- new space:literal 30:literal) +;? ($print (("parse-instruction-trace\n" literal))) ;? 1 + (in:trace-address <- next-input) + (buf:string-address <- get in:trace-address/deref contents:offset) +;? (print-string nil:literal buf:string-address) ;? 1 +;? ($print (("\n" literal))) ;? 1 + (result:instruction-trace-address <- new instruction-trace:literal) + (f1:string-address rest:string-address <- split-first buf:string-address ((#\space literal))) +;? ($print (("call-stack: " literal))) ;? 1 +;? (print-string nil:literal f1:string-address) ;? 1 +;? ($print (("\n" literal))) ;? 1 + (cs:string-address-array-address-address <- get-address result:instruction-trace-address/deref call-stack:offset) + (cs:string-address-array-address-address/deref <- split f1:string-address ((#\/ literal))) + (p:string-address-address <- get-address result:instruction-trace-address/deref pc:offset) + (p:string-address-address/deref rest:string-address <- split-first rest:string-address ((#\space literal))) + (inst:string-address-address <- get-address result:instruction-trace-address/deref instruction:offset) + (inst:string-address-address/deref <- copy rest:string-address) + (reply result:instruction-trace-address) +]) + +(function parse-trace [ ; string-address -> trace-address + (default-space:space-address <- new space:literal 30:literal) +;? ($print (("parse-trace\n" literal))) ;? 1 + (in:string-address <- next-input) + (result:trace-address <- new trace:literal) + (first:string-address rest:string-address <- split-first in:string-address ((#\: literal))) + (l:string-address-address <- get-address result:trace-address/deref label:offset) + (l:string-address-address/deref <- copy first:string-address) + (c:string-address-address <- get-address result:trace-address/deref contents:offset) + (c:string-address-address/deref <- copy rest:string-address) + (reply result:trace-address) +]) + +(function print-trace [ + (default-space:space-address <- new space:literal 30:literal) + (x:trace-address <- next-input) + (l:string-address <- get x:trace-address/deref label:offset) + (print-string nil:literal/terminal l:string-address) + ($print ((" : " literal))) + (c:string-address <- get x:trace-address/deref contents:offset) + (print-string nil:literal/terminal c:string-address) +]) + +(function print-instruction-trace [ + (default-space:space-address <- new space:literal 30:literal) + (x:instruction-trace-address <- next-input) + ; print call stack + (c:string-address-array-address <- get x:instruction-trace-address/deref call-stack:offset) + (i:integer <- copy 0:literal) + (len:integer <- length c:string-address-array-address/deref) + { begin + (done?:boolean <- greater-or-equal i:integer len:integer) + (break-if done?:boolean) + (s:string-address <- index c:string-address-array-address/deref i:integer) + (print-string nil:literal/terminal s:string-address) + ($print (("/" literal))) + (i:integer <- add i:integer 1:literal) + (loop) + } + ; print pc + ($print ((" " literal))) + (p:string-address <- get x:instruction-trace-address/deref pc:offset) + (print-string nil:literal/terminal p:string-address) + ; print instruction + ($print ((" : " literal))) + (i:string-address <- get x:instruction-trace-address/deref instruction:offset) + (print-string nil:literal/terminal i:string-address) + ($print (("\n" literal))) + ; print children + (ch:trace-address-array-address <- get x:instruction-trace-address/deref children:offset) + (i:integer <- copy 0:literal) + { begin + ; todo: test + (break-if ch:trace-address-array-address) + (reply) + } + (len:integer <- length ch:trace-address-array-address/deref) + { begin + (done?:boolean <- greater-or-equal i:integer len:integer) + (break-if done?:boolean) + (t:trace-address <- index ch:trace-address-array-address/deref i:integer) + ($print ((" " literal))) + (print-trace t:trace-address) + ($print (("\n" literal))) + (i:integer <- add i:integer 1:literal) + (loop) + } +]) + +(function main [ + (default-space:space-address <- new space:literal 30:literal/capacity) + (x:string-address <- new +"schedule: main +run:main 0: (((1 integer)) <- ((copy)) ((1 literal))) +run:main 0: 1 => ((1 integer)) +mem:((1 integer)): 1 <= 1 +run:main 1: (((2 integer)) <- ((copy)) ((3 literal))) +run:main 1: 3 => ((2 integer)) +mem:((2 integer)): 2 <= 3 +run:main 2: (((3 integer)) <- ((add)) ((1 integer)) ((2 integer))) +mem:((1 integer)) => 1 +mem:((2 integer)) => 3 +run:main 2: 4 => ((3 integer)) +mem:((3 integer)): 3 <= 4 +schedule: done with routine") + (s:stream-address <- init-stream x:string-address) + (arr:instruction-trace-address-array-address <- parse-traces s:stream-address) + (len:integer <- length arr:instruction-trace-address-array-address/deref) +;? ($print (("#traces: " literal))) ;? 1 +;? ($print len:integer) ;? 1 +;? ($print (("\n" literal))) ;? 1 + (i:integer <- copy 0:literal) + { begin + (done?:boolean <- greater-or-equal i:integer len:integer) + (break-if done?:boolean) + (tr:instruction-trace-address <- index arr:instruction-trace-address-array-address/deref i:integer) + (print-instruction-trace tr:instruction-trace-address) + (i:integer <- add i:integer 1:literal) + (loop) + } +]) |