update to 03-Jan-2009 am33: head, abort, and d-flag

[fleet.git] / src / edu / berkeley / fleet / assembler / fleet.g

diff --git a/src/edu/berkeley/fleet/assembler/fleet.g b/src/edu/berkeley/fleet/assembler/fleet.g
index 1a7a87a..90f601d 100644 (file)
--- a/src/edu/berkeley/fleet/assembler/fleet.g
+++ b/src/edu/berkeley/fleet/assembler/fleet.g
@@ -13,10 +13,11 @@ Fiber::         = Dock        ":" Instructions        /ws
 
 Instructions::  = Instruction +/ ws
 Instruction     = Instruction:: (Tags:: Tag*) InstructionX
+                | ^"head" ";" /ws
                 | ^"tail" ";" /ws
 Tag             = ^"[a]"  ws |  ^"[b]" ws
                 | ^"[!a]" ws | ^"[!b]" ws
-                | ^"[olc=0]" ws
+                | ^"[d]" ws
                 | ^"[*]" ws
                 | ^"[Rq]" ws
 InstructionX    = (() | ^"[T]" ws) ^"nop"                                            ";" /ws
@@ -31,6 +32,7 @@ InstructionX    = (() | ^"[T]" ws) ^"nop"
                 |                   "set" ^"word"      "=" Literal                   ";" /ws
                 |              ^"shift" Literal                                      ";" /ws
                 |              ^"flush"                                              ";" /ws
+                |              ^"abort"                                              ";" /ws
 
 Flags:: = (^"0") |  (^"1") | (^"a" |  ^"b" |  ^"c" | ^"!a" | ^"!b" | ^"!c") +/ (ws "|" ws)