X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=assembler%2Fparser.y;h=84a5c2466bd7a3c70970b0d6378df69222dedd95;hb=1a3add45d788768f4eebe333f488e7a22a89305e;hp=5e256abb45506d5d57dea26385af676e9c4eddc5;hpb=80d4431cde7dec47d2cd549ec581cc98dab67d5d;p=b43-tools.git

diff --git a/assembler/parser.y b/assembler/parser.y
index 5e256ab..84a5c24 100644
--- a/assembler/parser.y
+++ b/assembler/parser.y
@@ -102,35 +102,35 @@ section_switch	: SECTION_TEXT {
 		  }
 		;
 
-ivals_write	: IVAL_MMIO16 hexnum_decnum COMMA hexnum_decnum {
+ivals_write	: IVAL_MMIO16 imm_value COMMA imm_value {
 			struct initval_op *iop = xmalloc(sizeof(struct initval_op));
 			iop->type = IVAL_W_MMIO16;
 			iop->args[0] = (unsigned int)(unsigned long)$2;
 			iop->args[1] = (unsigned int)(unsigned long)$4;
 			$$ = iop;
 		  }
-		| IVAL_MMIO32 hexnum_decnum COMMA hexnum_decnum {
+		| IVAL_MMIO32 imm_value COMMA imm_value {
 			struct initval_op *iop = xmalloc(sizeof(struct initval_op));
 			iop->type = IVAL_W_MMIO32;
 			iop->args[0] = (unsigned int)(unsigned long)$2;
 			iop->args[1] = (unsigned int)(unsigned long)$4;
 			$$ = iop;
 		  }
-		| IVAL_PHY hexnum_decnum COMMA hexnum_decnum {
+		| IVAL_PHY imm_value COMMA imm_value {
 			struct initval_op *iop = xmalloc(sizeof(struct initval_op));
 			iop->type = IVAL_W_PHY;
 			iop->args[0] = (unsigned int)(unsigned long)$2;
 			iop->args[1] = (unsigned int)(unsigned long)$4;
 			$$ = iop;
 		  }
-		| IVAL_RADIO hexnum_decnum COMMA hexnum_decnum {
+		| IVAL_RADIO imm_value COMMA imm_value {
 			struct initval_op *iop = xmalloc(sizeof(struct initval_op));
 			iop->type = IVAL_W_RADIO;
 			iop->args[0] = (unsigned int)(unsigned long)$2;
 			iop->args[1] = (unsigned int)(unsigned long)$4;
 			$$ = iop;
 		  }
-		| IVAL_SHM16 hexnum_decnum COMMA hexnum_decnum COMMA hexnum_decnum {
+		| IVAL_SHM16 imm_value COMMA imm_value COMMA imm_value {
 			struct initval_op *iop = xmalloc(sizeof(struct initval_op));
 			iop->type = IVAL_W_SHM16;
 			iop->args[0] = (unsigned int)(unsigned long)$2;
@@ -138,7 +138,7 @@ ivals_write	: IVAL_MMIO16 hexnum_decnum COMMA hexnum_decnum {
 			iop->args[2] = (unsigned int)(unsigned long)$6;
 			$$ = iop;
 		  }
-		| IVAL_SHM32 hexnum_decnum COMMA hexnum_decnum COMMA hexnum_decnum {
+		| IVAL_SHM32 imm_value COMMA imm_value COMMA imm_value {
 			struct initval_op *iop = xmalloc(sizeof(struct initval_op));
 			iop->type = IVAL_W_SHM32;
 			iop->args[0] = (unsigned int)(unsigned long)$2;
@@ -1004,15 +1004,13 @@ extended_operlist : decnum COMMA decnum COMMA operand COMMA operand COMMA operan
 		  }
 		;
 
-external_jump_operands : imm COMMA operand COMMA operand COMMA labelref {
+external_jump_operands : imm COMMA labelref {
 			struct operlist *ol = xmalloc(sizeof(struct operlist));
 			struct operand *cond = xmalloc(sizeof(struct operand));
 			cond->type = OPER_IMM;
 			cond->u.imm = $1;
 			ol->oper[0] = cond;
 			ol->oper[1] = $3;
-			ol->oper[2] = $5;
-			ol->oper[3] = $7;
 			$$ = ol;
 		  }
 		;
@@ -1103,15 +1101,18 @@ mem		: BRACK_OPEN imm BRACK_CLOSE {
 		  }
 		;
 
-imm		: hexnum_decnum {
+imm		: imm_value {
 			struct immediate *imm = xmalloc(sizeof(struct immediate));
 			imm->imm = (unsigned long)$1;
 			$$ = imm;
 		  }
+		;
+
+imm_value	: hexnum_decnum {
+			$$ = $1;
+		  }
 		| complex_imm {
-			struct immediate *imm = xmalloc(sizeof(struct immediate));
-			imm->imm = (unsigned long)$1;
-			$$ = imm;
+			$$ = $1;
 		  }
 		;