Allow block comment on assembler

src/as/parse_asm.c

@@ -96,21 +96,47 @@ inline bool is_label_chr(char c) {
   return is_label_first_chr(c) || isdigit(c);
 }
 
-const char *skip_until_delimiter(const char *p) {
+static const char *get_label_end(ParseInfo *info) {
+  const char *start = info->p;
+  const char *p = start;
   if (*p == '"') {
     ++p;
-    for (char c; c = *p, c != '\0'; ++p) {
-      if (c == '"') {
-        ++p;
+    for (;;) {
+      char c = *p;
+      if (c == '\0') {
+        parse_error(info, "String not closed");
         break;
       }
+
+      ++p;
+      if (c == '"')
+        break;
       if (c == '\\')
         ++p;
     }
+    start += 2;
   } else {
-    for (char c; c = *p, !isspace(c) && c != ':' && c != '\0'; ++p)
-      ;
+    const unsigned char *q = (const unsigned char*)p;
+    int ucc = 0;
+    for (;;) {
+      int uc = *++q;
+      if (ucc > 0) {
+        if (!isutf8follow(uc)) {
+          parse_error(info, "Illegal byte sequence");
+          return NULL;
+        }
+        --ucc;
+        continue;
+      }
+      if ((ucc = isutf8first(uc) - 1) > 0)
+        continue;
+      if (!is_label_chr(uc))
+        break;
+    }
+    p = (const char*)q;
   }
+  if (p <= start)
+    parse_error(info, "Empty label");
   return p;
 }
 
@@ -119,45 +145,18 @@ const Name *unquote_label(const char *p, const char *q) {
     return alloc_name(p, q, false);
   if (q[-1] != '"' || q == p + 2)
     return NULL;
-  // TODO: Unquote
+  // TODO: Unescape
   return alloc_name(p + 1, q - 1, false);
 }
 
 static const Name *parse_label(ParseInfo *info) {
-  const char *p = info->p;
-  const char *start = p;
-  if (*p == '"') {
-    p = skip_until_delimiter(p);
-    if (p[-1] != '"' || p == start + 2)
-      return NULL;
-
-    info->p = p;
-    return alloc_name(start + 1, p - 1, false);
-  }
-
-  unsigned char *q = (unsigned char*)p;
-  int uc = *q;
-  int ucc = isutf8first(uc) - 1;
-  if (!(ucc > 0 || is_label_first_chr(uc)))
+  const char *start = info->p;
+  const char *p = get_label_end(info);
+  if (p == start)
     return NULL;
 
-  for (;;) {
-    uc = *++q;
-    if (ucc > 0) {
-      if (!isutf8follow(uc)) {
-        parse_error(info, "Illegal byte sequence");
-        return NULL;
-      }
-      --ucc;
-      continue;
-    }
-    if ((ucc = isutf8first(uc) - 1) > 0)
-      continue;
-    if (!is_label_chr(uc))
-      break;
-  }
-  info->p = p = (char*)q;
-  return alloc_name(start, p, false);
+  info->p = p;
+  return unquote_label(start, p);
 }
 
 static const Name *parse_section_name(ParseInfo *info) {
@@ -457,20 +456,38 @@ Expr *parse_expr(ParseInfo *info) {
   return parse_add(info);
 }
 
+static void check_line_end(ParseInfo *info) {
+  const char *p = info->p;
+  for (;;) {
+    const char *q = block_comment_start(p);
+    if (q == NULL)
+      break;
+    p = block_comment_end(q);
+    if (p == NULL) {
+      parse_error(info, "Block comment not closed");
+      return;
+    }
+  }
+  p = skip_whitespaces(p);
+  if (*p != '\0' && !(*p == '/' && p[1] == '/')) {
+    parse_error(info, "Syntax error");
+  }
+}
+
 Line *parse_line(ParseInfo *info) {
   Line *line = calloc_or_die(sizeof(*line));
   line->label = NULL;
   line->inst.op = NOOP;
   line->dir = NODIRECTIVE;
 
   const char *p = skip_whitespaces(info->rawline);
-  const char *q = skip_until_delimiter(p);
+  info->p = p;
+  const char *q = get_label_end(info);
   const char *r = skip_whitespaces(q);
   if (*r == ':') {
     const Name *label = unquote_label(p, q);
     if (label == NULL) {
       parse_error(info, "Illegal label");
-      err = true;
     } else {
       info->p = p;
       line->label = label;
@@ -488,10 +505,7 @@ Line *parse_line(ParseInfo *info) {
     } else if (*p != '\0') {
       info->p = p;
       parse_inst(info, &line->inst);
-      if (*info->p != '\0' && !(*info->p == '/' && info->p[1] == '/')) {
-        parse_error(info, "Syntax error");
-        err = true;
-      }
+      check_line_end(info);
     }
   }
   return line;

src/as/parse_asm.h

@@ -92,7 +92,6 @@ void parse_error(const ParseInfo *info, const char *message);
 void parse_inst(ParseInfo *info, Inst *inst);
 
 bool immediate(const char **pp, int64_t *value);
-const char *skip_until_delimiter(const char *p);
 const Name *unquote_label(const char *p, const char *q);
 Expr *parse_expr(ParseInfo *info);
 

src/cc/arch/aarch64/emit_code.c

@@ -178,13 +178,12 @@ static void emit_defun(Function *func) {
     label = quote_label(MANGLE(label));
     _GLOBL(label);
   } else {
-    emit_comment("%.*s: static func", NAMES(func->name));
     label = quote_label(label);
     _LOCAL(label);
   }
   EMIT_ALIGN(4);
 #if XCC_TARGET_PLATFORM != XCC_PLATFORM_APPLE
-  EMIT_ASM(".type", fmt("%.*s", NAMES(func->name)), "@function");
+  EMIT_ASM(".type", quote_label(fmt_name(func->name)), "@function");
 #endif
   EMIT_LABEL(label);
 

src/cc/arch/riscv64/emit_code.c

@@ -138,13 +138,12 @@ static void emit_defun(Function *func) {
     label = quote_label(MANGLE(label));
     _GLOBL(label);
   } else {
-    emit_comment("%.*s: static func", NAMES(func->name));
     label = quote_label(label);
     _LOCAL(label);
   }
   EMIT_ALIGN(2);
 #if XCC_TARGET_PLATFORM != XCC_PLATFORM_APPLE
-  EMIT_ASM(".type", fmt("%.*s", NAMES(func->name)), "@function");
+  EMIT_ASM(".type", quote_label(fmt_name(func->name)), "@function");
 #endif
   EMIT_LABEL(label);
 

src/cc/arch/x64/emit_code.c

@@ -171,7 +171,7 @@ static void emit_defun(Function *func) {
     _LOCAL(label);
   }
 #if XCC_TARGET_PLATFORM != XCC_PLATFORM_APPLE
-  EMIT_ASM(".type", fmt("%.*s", NAMES(func->name)), "@function");
+  EMIT_ASM(".type", quote_label(fmt_name(func->name)), "@function");
 #endif
   EMIT_LABEL(label);
 

src/cc/backend/emit_util.c

@@ -245,7 +245,7 @@ void emit_varinfo(const VarInfo *varinfo, const Initializer *init) {
     _LOCAL(label);
   }
 #if XCC_TARGET_PLATFORM != XCC_PLATFORM_APPLE
-  EMIT_ASM(".type", fmt("%.*s", NAMES(name)), "@object");
+  EMIT_ASM(".type", quote_label(fmt_name(name)), "@object");
 #endif
 
   if (init != NULL) {

src/cc/backend/emit_util.h

@@ -60,7 +60,7 @@ bool function_not_returned(FuncBackend *fnbe);
 
 #if XCC_TARGET_PLATFORM == XCC_PLATFORM_APPLE
 #define _RODATA()      _SECTION("__DATA,__const")
-#define _LOCAL(x)      ((void)0)
+#define _LOCAL(x)      emit_comment("%s: static func", x)
 #else
 #define _RODATA()      _SECTION(".rodata")
 #define _LOCAL(x)      EMIT_ASM(".local", x)

src/cc/frontend/lexer.c

@@ -360,21 +360,6 @@ static bool read_next_line(void) {
   return true;
 }
 
-const char *block_comment_start(const char *p) {
-  const char *q = skip_whitespaces(p);
-  return (*q == '/' && q[1] == '*') ? q : NULL;
-}
-
-const char *block_comment_end(const char *p) {
-  for (;;) {
-    p = strchr(p, '*');
-    if (p == NULL)
-      return NULL;
-    if (*(++p) == '/')
-      return p + 1;
-  }
-}
-
 static const char *skip_block_comment(const char *p) {
   for (;;) {
     p = block_comment_end(p);

src/cc/frontend/lexer.h

@@ -32,9 +32,6 @@ Token *alloc_dummy_ident(void);
 const char *get_lex_p(void);
 void lex_error(const char *p, const char *fmt, ...) __attribute__((noreturn));
 
-const char *block_comment_start(const char *p);
-const char *block_comment_end(const char *p);
-
 typedef bool (*LexEofCallback)(void);
 LexEofCallback set_lex_eof_callback(LexEofCallback callback);
 bool lex_eof_continue(void);

src/util/util.c

@@ -309,6 +309,21 @@ const char *skip_whitespaces(const char *s) {
   return s;
 }
 
+const char *block_comment_start(const char *p) {
+  const char *q = skip_whitespaces(p);
+  return (*q == '/' && q[1] == '*') ? q : NULL;
+}
+
+const char *block_comment_end(const char *p) {
+  for (;;) {
+    p = strchr(p, '*');
+    if (p == NULL)
+      return NULL;
+    if (*(++p) == '/')
+      return p + 1;
+  }
+}
+
 int64_t wrap_value(int64_t value, int size, bool is_unsigned) {
   if (is_unsigned) {
     switch (size) {

src/util/util.h

@@ -53,6 +53,8 @@ bool is_im8(intptr_t x);
 bool is_im16(intptr_t x);
 bool is_im32(intptr_t x);
 const char *skip_whitespaces(const char *s);
+const char *block_comment_start(const char *p);
+const char *block_comment_end(const char *p);
 int64_t wrap_value(int64_t value, int size, bool is_unsigned);
 
 // Container