summaryrefslogtreecommitdiff
path: root/masm/parse.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--masm/parse.c58
1 files changed, 29 insertions, 29 deletions
diff --git a/masm/parse.c b/masm/parse.c
index 2a84a91..d0a1f33 100644
--- a/masm/parse.c
+++ b/masm/parse.c
@@ -364,21 +364,21 @@ static int parse_instruction_r(struct parser *parser,
if (parse_register(parser, &reg))
return M_ERROR;
- ins->R_data.rd = reg;
+ ins->data.R.rd = reg;
if (assert_token(parser, TOK_COMMA, NULL))
return M_ERROR;
if (parse_register(parser, &reg))
return M_ERROR;
- ins->R_data.rs = reg;
+ ins->data.R.rs = reg;
if (assert_token(parser, TOK_COMMA, NULL))
return M_ERROR;
if (parse_register(parser, &reg))
return M_ERROR;
- ins->R_data.rt = reg;
+ ins->data.R.rt = reg;
return M_SUCCESS;
}
@@ -391,14 +391,14 @@ static int parse_instruction_r2(struct parser *parser,
if (parse_register(parser, &reg))
return M_ERROR;
- ins->R_data.rs = reg;
+ ins->data.R.rs = reg;
if (assert_token(parser, TOK_COMMA, NULL))
return M_ERROR;
if (parse_register(parser, &reg))
return M_ERROR;
- ins->R_data.rt = reg;
+ ins->data.R.rt = reg;
return M_SUCCESS;
}
@@ -411,7 +411,7 @@ static int parse_instruction_rs(struct parser *parser,
if (parse_register(parser, &reg))
return M_ERROR;
- ins->R_data.rs = reg;
+ ins->data.R.rs = reg;
return M_SUCCESS;
}
@@ -424,7 +424,7 @@ static int parse_instruction_rd(struct parser *parser,
if (parse_register(parser, &reg))
return M_ERROR;
- ins->R_data.rd = reg;
+ ins->data.R.rd = reg;
return M_SUCCESS;
}
@@ -438,14 +438,14 @@ static int parse_instruction_i(struct parser *parser,
if (parse_register(parser, &reg))
return M_ERROR;
- ins->I_data.rt = reg;
+ ins->data.I.rt = reg;
if (assert_token(parser, TOK_COMMA, NULL))
return M_ERROR;
if (parse_register(parser, &reg))
return M_ERROR;
- ins->I_data.rs = reg;
+ ins->data.I.rs = reg;
if (assert_token(parser, TOK_COMMA, NULL))
return M_ERROR;
@@ -455,7 +455,7 @@ static int parse_instruction_i(struct parser *parser,
if (token.number >= MAX16)
return M_ERROR;
- ins->I_data.immd = token.number;
+ ins->data.I.immd = token.number;
return M_SUCCESS;
}
@@ -471,10 +471,10 @@ static int parse_instruction_offset(struct parser *parser,
switch (max) {
case MAX26:
- ins->J_data.target = n;
+ ins->data.J.target = n;
break;
case MAX16:
- ins->B_data.offset = n;
+ ins->data.B.offset = n;
break;
}
@@ -488,7 +488,7 @@ static int parse_instruction_j(struct parser *parser,
uint32_t n;
if (get_target(parser, &n, ref) || n > MAX26)
return M_ERROR;
- ins->J_data.target = n;
+ ins->data.J.target = n;
return M_SUCCESS;
}
@@ -500,7 +500,7 @@ static int parse_instruction_jr(struct parser *parser,
uint32_t n;
if (get_target(parser, &n, ref) || n > MAX26)
return M_ERROR;
- ins->J_data.target = n;
+ ins->data.J.target = n;
return M_SUCCESS;
}
@@ -511,7 +511,7 @@ static int parse_instruction_branch_equal(struct parser *parser,
enum mips_register reg;
if (parse_register(parser, &reg))
return M_ERROR;
- ins->R_data.rs = reg;
+ ins->data.R.rs = reg;
return M_SUCCESS;
}
@@ -525,14 +525,14 @@ static int parse_instruction_branch(struct parser *parser,
if (parse_register(parser, &reg))
return M_ERROR;
- ins->B_data.rs = reg;
+ ins->data.B.rs = reg;
if (assert_token(parser, TOK_COMMA, NULL))
return M_ERROR;
if (get_offset(parser, &n, ref) || n > MAX16)
return M_ERROR;
- ins->B_data.offset = n;
+ ins->data.B.offset = n;
return M_SUCCESS;
}
@@ -547,7 +547,7 @@ static int parse_instruction_sl(struct parser *parser,
if (parse_register(parser, &reg))
return M_ERROR;
- ins->I_data.rt = reg;
+ ins->data.I.rt = reg;
if (assert_token(parser, TOK_COMMA, NULL))
return M_ERROR;
@@ -558,13 +558,13 @@ static int parse_instruction_sl(struct parser *parser,
if (token.type != TOK_LPAREN)
if (get_offset(parser, &offset, ref))
return M_ERROR;
- ins->I_data.immd = offset;
+ ins->data.I.immd = offset;
if (peek_token(parser, &token))
return M_ERROR;
if (token.type == TOK_NL) {
- ins->I_data.rs = MIPS_REG_ZERO;
+ ins->data.I.rs = MIPS_REG_ZERO;
return M_SUCCESS;
}
@@ -573,7 +573,7 @@ static int parse_instruction_sl(struct parser *parser,
if (parse_register(parser, &reg))
return M_ERROR;
- ins->I_data.rs = reg;
+ ins->data.I.rs = reg;
if (assert_token(parser, TOK_RPAREN, NULL))
return M_ERROR;
@@ -589,14 +589,14 @@ static int parse_instruction_sli(struct parser *parser,
if (parse_register(parser, &reg))
return M_ERROR;
- ins->I_data.rt = reg;
+ ins->data.I.rt = reg;
if (assert_token(parser, TOK_COMMA, NULL))
return M_ERROR;
if (assert_token(parser, TOK_NUMBER, &token) || token.number > MAX16)
return M_ERROR;
- ins->I_data.immd = token.number;
+ ins->data.I.immd = token.number;
return M_SUCCESS;
}
@@ -609,21 +609,21 @@ static int parse_instruction_s(struct parser *parser,
if (parse_register(parser, &reg))
return M_ERROR;
- ins->R_data.rd = reg;
+ ins->data.R.rd = reg;
if (assert_token(parser, TOK_COMMA, NULL))
return M_ERROR;
if (parse_register(parser, &reg))
return M_ERROR;
- ins->R_data.rt = reg;
+ ins->data.R.rt = reg;
if (assert_token(parser, TOK_COMMA, NULL))
return M_ERROR;
if (assert_token(parser, TOK_NUMBER, &token) || token.number > MAX5)
return M_ERROR;
- ins->R_data.shamt = token.number;
+ ins->data.R.shamt = token.number;
return M_SUCCESS;
}
@@ -635,21 +635,21 @@ static int parse_instruction_sv(struct parser *parser,
if (parse_register(parser, &reg))
return M_ERROR;
- ins->R_data.rd = reg;
+ ins->data.R.rd = reg;
if (assert_token(parser, TOK_COMMA, NULL))
return M_ERROR;
if (parse_register(parser, &reg))
return M_ERROR;
- ins->R_data.rt = reg;
+ ins->data.R.rt = reg;
if (assert_token(parser, TOK_COMMA, NULL))
return M_ERROR;
if (parse_register(parser, &reg))
return M_ERROR;
- ins->R_data.rs = reg;
+ ins->data.R.rs = reg;
return M_SUCCESS;
}