feat: add <<, >>, <<=, >>>=

diohabara · Jul 26, 2023 · 1adbe08 · 1adbe08
1 parent 4cbd6ca
commit 1adbe08
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 9 deletions.
diff --git a/ccc.h b/ccc.h
@@ -118,6 +118,10 @@ typedef enum {
   ND_BITXOR,     // ^
   ND_LOGAND,     // &&
   ND_LOGOR,      // ||
+  ND_SHL,        // <<
+  ND_SHR,        // >>
+  ND_A_SHL,      // <<=
+  ND_A_SHR,      // >>=
 } NodeKind;
 // AST node type
 typedef struct Node Node;

diff --git a/codegen.c b/codegen.c
@@ -396,6 +396,8 @@ void gen(Node *node) {
     case ND_A_MUL:
     case ND_A_DIV:
     case ND_A_MOD:
+    case ND_A_SHL:
+    case ND_A_SHR: {
       gen_lval(node->lhs);
       printf("  push [rsp]\n");
       load(node->ty);
@@ -427,10 +429,19 @@ void gen(Node *node) {
           printf("  idiv rdi\n");
           printf("  mov rax, rdx\n");
           break;
+        case ND_A_SHL:
+          printf("  mov cl, dil\n");
+          printf("  shl rax, cl\n");
+          break;
+        case ND_A_SHR:
+          printf("  mov cl, dil\n");
+          printf("  sar rax, cl\n");
+          break;
       }
       printf("  push rax\n");
       store(node->ty);
       return;
+    }
     case ND_NOT:
       gen(node->lhs);
       printf("  pop rax\n");
@@ -500,6 +511,14 @@ void gen(Node *node) {
     case ND_BITXOR:
       printf("  xor rax, rdi\n");
       break;
+    case ND_SHL:
+      printf("  mov cl, dil\n");
+      printf("  shl rax, cl\n");
+      break;
+    case ND_SHR:
+      printf("  mov cl, dil\n");
+      printf("  sar rax, cl\n");
+      break;
   }
   printf("  push rax\n");
 }

diff --git a/parse.c b/parse.c
@@ -168,6 +168,7 @@ Node *logand();
 Node *logor();
 Node *equality();
 Node *relational();
+Node *shift();
 Node *add();
 Node *mul();
 Node *cast();
@@ -820,7 +821,7 @@ Node *expr() {
   return node;
 }
 // assign = logor (assign-op assign)?
-// assign-op = "=" | "+=" | "-=" | "*=" | "/=" | "%="
+// assign-op = "=" | "+=" | "-=" | "*=" | "/=" | "%=" | "<<=" | ">>="
 Node *assign() {
   Node *node = logor();
   Token *tok;
@@ -842,6 +843,12 @@ Node *assign() {
   if (tok = consume("%=")) {
     node = new_binary(ND_A_MOD, node, assign(), tok);
   }
+  if (tok = consume("<<=")) {
+    node = new_binary(ND_A_SHL, node, assign(), tok);
+  }
+  if (tok = consume(">>=")) {
+    node = new_binary(ND_A_SHR, node, assign(), tok);
+  }
   return node;
 }
 
@@ -909,24 +916,40 @@ Node *equality() {
   }
 }
 
-// relational = add ("<" add | "<=" add | ">" add | ">=" add)*
+// relational = shift ("<" shift | "<=" shift | ">" shift | ">=" shift)*
 Node *relational() {
-  Node *node = add();
+  Node *node = shift();
   Token *tok;
   for (;;) {
     if (tok = consume("<"))
-      node = new_binary(ND_LT, node, add(), tok);
+      node = new_binary(ND_LT, node, shift(), tok);
     else if (tok = consume("<="))
-      node = new_binary(ND_LE, node, add(), tok);
+      node = new_binary(ND_LE, node, shift(), tok);
     else if (tok = consume(">"))
-      node = new_binary(ND_LT, add(), node, tok);
+      node = new_binary(ND_LT, shift(), node, tok);
     else if (tok = consume(">="))
-      node = new_binary(ND_LE, add(), node, tok);
+      node = new_binary(ND_LE, shift(), node, tok);
     else
       return node;
   }
 }
 
+// shift = add ("<<" add | ">>" add)*
+Node *shift() {
+  Node *node = add();
+  Token *tok;
+
+  for (;;) {
+    if (tok = consume("<<")) {
+      node = new_binary(ND_SHL, node, add(), tok);
+    } else if (tok = consume(">>")) {
+      node = new_binary(ND_SHR, node, add(), tok);
+    } else {
+      return node;
+    }
+  }
+}
+
 // add = mul ("+" mul | "-" mul)*
 Node *add() {
   Node *node = mul();

diff --git a/tests b/tests
@@ -811,6 +811,19 @@ int main() {
   assert(1, ({ struct T { struct T *next; int x; } a; struct T b; b.x=1; a.next=&b; a.next->x; }), "struct T { struct T *next; int x; } a; struct T b; b.x=1; a.next=&b; a.next->x;");
 
   voidfn();
+
+  assert(1, 1<<0, "1<<0");
+  assert(8, 1<<3, "1<<3");
+  assert(10, 5<<1, "5<<1");
+  assert(2, 5>>1, "5>>1");
+  assert(-1, -1>>1, "-1>>1");
+  assert(1, ({ int i=1; i<<=0; i; }), "int i=1; i<<0;");
+  assert(8, ({ int i=1; i<<=3; i; }), "int i=1; i<<3;");
+  assert(10, ({ int i=5; i<<=1; i; }), "int i=5; i<<1;");
+  assert(2, ({ int i=5; i>>=1; i; }), "int i=5; i>>1;");
+  assert(-1, -1, "-1");
+  assert(-1, ({ int i=-1; i; }), "int i=-1; i;");
+  assert(-1, ({ int i=-1; i>>=1; i; }), "int i=1; i>>1;");
 
   printf("OK\n");
   return 0;

diff --git a/tokenize.c b/tokenize.c
@@ -161,8 +161,8 @@ char *starts_with_reserved(char *p) {
     }
   }
   // Multi-letter punctuator
-  static char *ops[] = {"==", "!=", "<=", ">=", "->", "++", "--",
-                        "+=", "-=", "*=", "/=", "&=", "&&", "||"};
+  static char *ops[] = {"<<=", ">>=", "==", "!=", "<=", ">=", "->", "++", "--",
+                        "<<",  ">>",  "+=", "-=", "*=", "/=", "&&", "||"};
   for (int i = 0; i < sizeof(ops) / sizeof(*ops); i++)
     if (startswith(p, ops[i])) {
       return ops[i];

diff --git a/type.c b/type.c
@@ -149,6 +149,8 @@ void visit(Node* node) {
       node->ty = node->lhs->ty;
       return;
     case ND_ASSIGN:
+    case ND_SHL:
+    case ND_SHR:
     case ND_PRE_INC:
     case ND_PRE_DEC:
     case ND_POST_INC:
@@ -158,6 +160,8 @@ void visit(Node* node) {
     case ND_A_MUL:
     case ND_A_DIV:
     case ND_A_MOD:
+    case ND_A_SHL:
+    case ND_A_SHR:
     case ND_BITNOT:
       node->ty = node->lhs->ty;
       return;