arm-asm: Add cdp2

Also allow instructions without condition code in the first place

Danny Milosavljevic committed 5 years ago

Commit a1dad7a1 parent 036a7fe3 files · +21 −6Browse files

Unified · Split

3 files

arm-asm.c +15 −5
arm-tok.h +4 −0
tests/arm-asm-testsuite.sh +2 −1

@@ -155,7 +155,7 @@ ST_FUNC void gen_expr32(ExprValue *pe) · 154 unmodified lines
155	155
156	156	static uint32_t condition_code_of_token(int token) {
157	157	if (token < TOK_ASM_nopeq) {
158		− expect("instruction");
	158	+ expect("condition-enabled instruction");
159	159	return 0;
160	160	} else
161	161	return (token - TOK_ASM_nopeq) & 15;
@@ -335,6 +335,7 @@ static void asm_coprocessor_opcode(TCCState *s1, int token) { · 173 unmodified lines
335	335	Operand opcode2;
336	336	uint8_t registers[3];
337	337	unsigned int i;
	338	+ uint8_t high_nibble;
338	339
339	340	if (tok >= TOK_ASM_p0 && tok <= TOK_ASM_p15) {
340	341	coprocessor = tok - TOK_ASM_p0;
@@ -380,7 +381,11 @@ static void asm_coprocessor_opcode(TCCState *s1, int token) { · 39 unmodified lines
380	381	return;
381	382	}
382	383
383		− asm_emit_coprocessor_opcode(condition_code_of_token(token), coprocessor, opcode1.e.v, registers[0], registers[1], registers[2], opcode2.e.v, 0);
	384	+ if (token == TOK_ASM_cdp2)
	385	+ high_nibble = 0xF;
	386	+ else
	387	+ high_nibble = condition_code_of_token(token);
	388	+ asm_emit_coprocessor_opcode(high_nibble, coprocessor, opcode1.e.v, registers[0], registers[1], registers[2], opcode2.e.v, 0);
384	389	}
385	390
386	391	/* data processing and single data transfer instructions only */
@@ -1426,9 +1431,14 @@ ST_FUNC void asm_opcode(TCCState *s1, int token) · 1039 unmodified lines
1426	1431	}
1427	1432	if (token == TOK_EOF)
1428	1433	return;
1429		− if (token < TOK_ASM_nopeq) {
1430		− expect("instruction");
1431		− return;
	1434	+ if (token < TOK_ASM_nopeq) { // no condition code
	1435	+ switch (token) {
	1436	+ case TOK_ASM_cdp2:
	1437	+ return asm_coprocessor_opcode(s1, token);
	1438	+ default:
	1439	+ expect("instruction");
	1440	+ return;
	1441	+ }
1432	1442	}
1433	1443
1434	1444	switch (ARM_INSTRUCTION_GROUP(token)) {

arm-tok.h+4−0

@@ -70,6 +70,10 @@ · 69 unmodified lines
70	70
71	71	DEF_ASM(asl)
72	72
	73	+ /* instructions that have no condition code */
	74	+
	75	+ DEF_ASM(cdp2)
	76	+
73	77	#define ARM_INSTRUCTION_GROUP(tok) ((((tok) - TOK_ASM_nopeq) & 0xFFFFFFF0) + TOK_ASM_nopeq)
74	78
75	79	/* Note: condition code is 4 bits */

tests/arm-asm-testsuite.sh+2−1

@@ -5,7 +5,7 @@ set -e · 4 unmodified lines
5	5	# Note: "{r3}" is definitely different--but would complicate the assembler.
6	6
7	7	state="`mktemp -d`"
8		−cat ../arm-tok.h \|grep DEF_ASM_CONDED \|grep -v '#define' \|grep -v '/[]' \|sed -e 's;DEF_ASM_CONDED.$.$.$;\1;'\| grep -v 'not useful' \| while read s
	8	+cat ../arm-tok.h \|grep DEF_ASM \|grep -v 'not useful' \|grep -v '#define' \|grep -v '/[]' \|sed -e 's;^[ ]DEF_ASM[^(]($.$).*$;\1;' \| egrep -v '^((r\|c\|p)[0-9]+\|fp\|ip\|sp\|lr\|pc\|asl)$' \| while read s
9	9	do
10	10	ok=0
11	11	for args in "r3, r4, r5, r6" \
@@ -90,6 +90,7 @@ do · 78 unmodified lines
90	90	"r4, #0xFFFFFF00" \
91	91	"r2, #-4" \
92	92	"p10, #7, c2, c0, c1, #4" \
	93	+ "p10, #7, r2, c0, c1, #4" \
93	94	"#4" \
94	95	"#-4" \
95	96	""

arm-asm: Add cdp2

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code