From 9021fa75626243f5fabdf69e0f826b70c53ee007 Mon Sep 17 00:00:00 2001 From: sogaiu <983021772@users.noreply.github.com> Date: Sat, 17 Jun 2023 11:30:27 +0900 Subject: [PATCH 1/2] Tweak abstract machine reference table --- content/docs/gen-asm-table.janet | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/docs/gen-asm-table.janet b/content/docs/gen-asm-table.janet index 5e6d279b..06a29395 100644 --- a/content/docs/gen-asm-table.janet +++ b/content/docs/gen-asm-table.janet @@ -59,13 +59,13 @@ ['neqim '(neqim dest lhs im) "$dest = $lhs != $im"] ['next '(next dest ds key) "$dest = next($ds, $key)"] ['noop '(noop) "Does nothing."] - ['prop '(prop val fiber) "Propagate (Re-raise) a signal that has been caught."] + ['prop '(prop dest val fiber) "Propagate (Re-raise) a signal that has been caught."] ['push '(push val) "Push $val on args"] ['push2 '(push2 val1 val2) "Push $val1, $val2 on args"] ['push3 '(push3 val1 val2 val3) "Push $val1, $val2, $val3, on args"] ['pusha '(pusha array) "Push values in $array on args"] ['put '(put ds key val) "$ds[$key] = $val"] - ['puti '(puti ds index val) "$ds[index] = $val"] + ['puti '(puti ds val index) "$ds[index] = $val"] ['rem '(rem dest lhs rhs) "$dest = $lhs % $rhs"] ['res '(res dest fiber val) "$dest = resume $fiber with $val"] ['ret '(ret val) "Return $val"] @@ -80,7 +80,7 @@ ['sruim '(sruim dest lhs shamt) "$dest = $lhs >>> shamt"] ['sub '(sub dest lhs rhs) "$dest = $lhs - $rhs"] ['tcall '(tcall callee) "Return call($callee, args)"] - ['tchck '(tcheck slot types) "Assert $slot matches types"]]) + ['tchck '(tchck slot types) "Assert $slot matches types"]]) (defn gen "Reference table for assembly instructions." From c779fddc71dae05c436a5a1ba072b70ade227d0e Mon Sep 17 00:00:00 2001 From: sogaiu <983021772@users.noreply.github.com> Date: Sat, 17 Jun 2023 19:58:58 +0900 Subject: [PATCH 2/2] Change setu argument order in table --- content/docs/gen-asm-table.janet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/docs/gen-asm-table.janet b/content/docs/gen-asm-table.janet index 06a29395..56052fb6 100644 --- a/content/docs/gen-asm-table.janet +++ b/content/docs/gen-asm-table.janet @@ -70,7 +70,7 @@ ['res '(res dest fiber val) "$dest = resume $fiber with $val"] ['ret '(ret val) "Return $val"] ['retn '(retn) "Return nil"] - ['setu '(setu env index val) "envs[env][index] = $val"] + ['setu '(setu val env index) "envs[env][index] = $val"] ['sig '(sig dest value sigtype) "$dest = emit $value as sigtype"] ['sl '(sl dest lhs rhs) "$dest = $lhs << $rhs"] ['slim '(slim dest lhs shamt) "$dest = $lhs << shamt"]