asm: implement parsing of classes, dot-mnemonics

asm/parse/block.c

@@ -18,6 +18,7 @@
 enum instr_component {
 	INSTR_NONE = 0,
 	INSTR_OPCODE,
+	INSTR_OPCODE_DOT,
 	INSTR_OPERAND,
 	INSTR_OPERAND_SEPARATOR,
 	INSTR_OPERAND_INDEX_LEFT,
@@ -38,17 +39,25 @@ enum index_base {
 enum arg_type {
 	ARG_NONE = 0,
 	ARG_CONST,
+	ARG_LABEL,
 	ARG_REG,
 	ARG_INDEX_REG,
 	ARG_INDEX_CONST,
 };
 
+struct label {
+	b_queue_entry l_entry;
+	struct ivy_asm_token *l_name;
+	unsigned long long l_offset;
+};
+
 struct arg {
 	enum arg_type arg_type;
 	b_queue_entry arg_entry;
 
 	union {
 		struct ivy_asm_token *arg_const;
+		struct ivy_asm_token *arg_label;
 		struct {
 			struct ivy_asm_token *reg_token;
 			unsigned long long reg_index;
@@ -75,7 +84,9 @@ struct block_parser_state {
 	unsigned int s_prev_token;
 	enum instr_component s_prev_component;
 
-	struct ivy_asm_token *s_mnemonic;
+	b_queue s_labels;
+
+	b_queue s_mnemonic;
 
 	b_queue s_args;
 	struct arg *s_current_arg;
@@ -165,6 +176,42 @@ static enum ivy_status push_const_arg(
 	return IVY_OK;
 }
 
+static enum ivy_status push_label(
+	struct block_parser_state *state, struct ivy_asm_token *tok)
+{
+	struct label *label = malloc(sizeof *label);
+	if (!label) {
+		return IVY_ERR_NO_MEMORY;
+	}
+
+	memset(label, 0x0, sizeof *label);
+
+	label->l_name = tok;
+	/* TODO */
+	label->l_offset = 0;
+
+	b_queue_push_back(&state->s_labels, &label->l_entry);
+	return IVY_OK;
+}
+
+static enum ivy_status push_label_arg(
+	struct block_parser_state *state, struct ivy_asm_token *tok,
+	unsigned long long reg_index)
+{
+	struct arg *arg = malloc(sizeof *arg);
+	if (!arg) {
+		return IVY_ERR_NO_MEMORY;
+	}
+
+	memset(arg, 0x0, sizeof *arg);
+
+	arg->arg_type = ARG_LABEL;
+	arg->arg_label = tok;
+
+	b_queue_push_back(&state->s_args, &arg->arg_entry);
+	return IVY_OK;
+}
+
 static enum ivy_status push_reg_arg(
 	struct block_parser_state *state, struct ivy_asm_token *tok,
 	unsigned long long reg_index)
@@ -235,18 +282,20 @@ static enum ivy_status parse_ident(
 
 	switch (state->s_prev_component) {
 	case INSTR_NONE:
-		state->s_mnemonic = tok;
+	case INSTR_OPCODE_DOT:
+		b_queue_push_back(&state->s_mnemonic, &tok->t_entry);
 		state->s_prev_component = INSTR_OPCODE;
 		return IVY_OK;
 	case INSTR_OPCODE:
 	case INSTR_OPERAND_SEPARATOR:
 		x = get_register_index(tok);
-		if (x == REG_INDEX_INVALID) {
-			return IVY_ERR_BAD_SYNTAX;
-		}
-
 		state->s_prev_component = INSTR_OPERAND;
-		return push_reg_arg(state, tok, x);
+
+		if (x == REG_INDEX_INVALID) {
+			return push_label_arg(state, tok, x);
+		} else {
+			return push_reg_arg(state, tok, x);
+		}
 	case INSTR_OPERAND_INDEX_LEFT:
 		x = get_index_base(tok);
 		if (x == INDEX_NONE) {
@@ -266,14 +315,32 @@ static enum ivy_status parse_ident(
 	return IVY_ERR_BAD_SYNTAX;
 }
 
+static enum ivy_status parse_dot(
+	struct ivy_asm_parser *ctx, struct ivy_asm_token *tok)
+{
+	struct block_parser_state *state
+		= (struct block_parser_state *)asm_parser_get_state(ctx);
+
+	if (state->s_prev_component != INSTR_OPCODE) {
+		return IVY_ERR_BAD_SYNTAX;
+	}
+
+	state->s_prev_component = INSTR_OPCODE_DOT;
+	return IVY_OK;
+}
+
 static enum ivy_status parse_label(
 	struct ivy_asm_parser *ctx, struct ivy_asm_token *tok)
 {
 	struct block_parser_state *state
 		= (struct block_parser_state *)asm_parser_get_state(ctx);
 
-	/* not sure what this is but we aren't expecting it. */
-	return IVY_ERR_BAD_SYNTAX;
+	if (state->s_prev_component != INSTR_NONE) {
+		/* not sure what this is but we aren't expecting it. */
+		return IVY_ERR_BAD_SYNTAX;
+	}
+
+	return push_label(state, tok);
 }
 
 static enum ivy_status parse_comma(
@@ -355,10 +422,13 @@ static enum ivy_status parse_end(
 
 static void init_state(struct ivy_asm_parser *ctx, struct parser_state *state)
 {
+	ivy_assembler_begin_scope(
+		ctx->p_assembler, IVY_ASM_SCOPE_BLOCK, state->s_attrib);
 }
 
 static void finish_state(struct ivy_asm_parser *ctx, struct parser_state *state)
 {
+	ivy_assembler_end_scope(ctx->p_assembler);
 }
 
 struct parser_state_type block_parser_state_type = {
@@ -375,6 +445,7 @@ struct parser_state_type block_parser_state_type = {
 		SYM_PARSER(LEFT_BRACKET, parse_left_bracket),
 		SYM_PARSER(RIGHT_BRACKET, parse_right_bracket),
 		SYM_PARSER(COMMA, parse_comma),
+		SYM_PARSER(DOT, parse_dot),
 	},
 	.n_keyword_parsers = {
 		KW_PARSER(END, parse_end),