summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin Carbonneaux <quentin.carbonneaux@yale.edu>2015-07-03 15:19:36 -0400
committerQuentin Carbonneaux <quentin.carbonneaux@yale.edu>2015-09-15 23:01:27 -0400
commit3765d2c33dbb29058fdab7b533ae8f981018e1d2 (patch)
tree3f1c2da1d9c31eb22e989938260a57945c2391a9
parent6d0ffe229192bd3eea0f8997a2cc91a01cda8b38 (diff)
downloadroux-3765d2c33dbb29058fdab7b533ae8f981018e1d2.tar.gz
rename branching cnd to jez
-rw-r--r--lisc/lisc.h2
-rw-r--r--lisc/parse.c10
-rw-r--r--lisc/test/loop.ssa2
3 files changed, 7 insertions, 7 deletions
diff --git a/lisc/lisc.h b/lisc/lisc.h
index 2219628..b9e5093 100644
--- a/lisc/lisc.h
+++ b/lisc/lisc.h
@@ -60,7 +60,7 @@ enum {
JXXX,
JRet,
JJmp,
- JCnd,
+ JJez,
};
struct Ins {
diff --git a/lisc/parse.c b/lisc/parse.c
index 20c3dc6..db45960 100644
--- a/lisc/parse.c
+++ b/lisc/parse.c
@@ -29,7 +29,7 @@ enum Token {
TMod,
TPhi,
TJmp,
- TCnd,
+ TJez,
TRet,
TNum,
@@ -101,7 +101,7 @@ lex()
{ "mod", TMod },
{ "phi", TPhi },
{ "jmp", TJmp },
- { "cnd", TCnd },
+ { "jez", TJez },
{ "ret", TRet },
{ 0 },
};
@@ -334,11 +334,11 @@ parseline(PState ps)
case TJmp:
curb->jmp.type = JJmp;
goto Jump;
- case TCnd:
- curb->jmp.type = JCnd;
+ case TJez:
+ curb->jmp.type = JJez;
r = parseref();
if (r == R)
- err("invalid argument for cnd jump");
+ err("invalid argument for jez jump");
curb->jmp.arg = r;
expect(TComma);
Jump:
diff --git a/lisc/test/loop.ssa b/lisc/test/loop.ssa
index 6fea1c6..37d9478 100644
--- a/lisc/test/loop.ssa
+++ b/lisc/test/loop.ssa
@@ -13,7 +13,7 @@
%n1 = sub %n, 1
%s1 = add %s, %n
- cnd %n1, @end, @loop
+ jez %n1, @end, @loop
@end
ret