roska
/
tinycc
mirror of https://repo.or.cz/tinycc.git
1
0
Fork 0
Code

riscv: Move operand parsing to a separate function

This commit is contained in:
Ekaitz Zarraga 2024-03-19 09:45:48 +01:00
parent 2b0a663df9
commit 019d10fc12
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
riscv64-asm.c
View File

@ -62,6 +62,7 @@ static void asm_ternary_opcode(TCCState *s1, int token);
static void asm_unary_opcode(TCCState *s1, int token); static void asm_unary_opcode(TCCState *s1, int token);
ST_FUNC void gen_expr32(ExprValue *pe); ST_FUNC void gen_expr32(ExprValue *pe);
static void parse_operand(TCCState *s1, Operand *op); static void parse_operand(TCCState *s1, Operand *op);
static void parse_operands(TCCState *s1, Operand *ops, int count);
ST_FUNC void subst_asm_operand(CString *add_str, SValue *sv, int modifier); ST_FUNC void subst_asm_operand(CString *add_str, SValue *sv, int modifier);
/* C extension */ /* C extension */
static void asm_emit_ca(int token, uint16_t opcode, const Operand *rd, const Operand *rs2); static void asm_emit_ca(int token, uint16_t opcode, const Operand *rd, const Operand *rs2);
@ -209,13 +210,26 @@ static void parse_operand(TCCState *s1, Operand *op)
} }
} }
static void parse_operands(TCCState *s1, Operand* ops, int count){
int i;
for (i = 0; i < count; i++) {
if ( i != 0 ) {
if ( tok == ',')
next();
else
expect("','");
}
parse_operand(s1, &ops[i]);
}
}
static void asm_unary_opcode(TCCState *s1, int token) static void asm_unary_opcode(TCCState *s1, int token)
{ {
uint32_t opcode = (0x1C << 2) | 3 | (2 << 12); uint32_t opcode = (0x1C << 2) | 3 | (2 << 12);
Operand op; Operand op;
static const Operand nil = {.type = OP_REG}; static const Operand nil = {.type = OP_REG};
parse_operand(s1, &op); parse_operands(s1, &op, 1);
/* Note: Those all map to CSR--so they are pseudo-instructions. */ /* Note: Those all map to CSR--so they are pseudo-instructions. */
opcode |= ENCODE_RD(op.reg); opcode |= ENCODE_RD(op.reg);
@ -280,12 +294,7 @@ static void asm_emit_u(int token, uint32_t opcode, const Operand* rd, const Oper
static void asm_binary_opcode(TCCState* s1, int token) static void asm_binary_opcode(TCCState* s1, int token)
{ {
Operand ops[2]; Operand ops[2];
parse_operand(s1, &ops[0]); parse_operands(s1, &ops[0], 2);
if (tok == ',')
next();
else
expect("','");
parse_operand(s1, &ops[1]);
switch (token) { switch (token) {
case TOK_ASM_lui: case TOK_ASM_lui:
@ -499,17 +508,7 @@ static void asm_emit_j(int token, uint32_t opcode, const Operand* rd, const Oper
static void asm_ternary_opcode(TCCState *s1, int token) static void asm_ternary_opcode(TCCState *s1, int token)
{ {
Operand ops[3]; Operand ops[3];
parse_operand(s1, &ops[0]); parse_operands(s1, &ops[0], 3);
if (tok == ',')
next();
else
expect("','");
parse_operand(s1, &ops[1]);
if (tok == ',')
next();
else
expect("','");
parse_operand(s1, &ops[2]);
switch (token) { switch (token) {
case TOK_ASM_sll: case TOK_ASM_sll: