diff options
| author | Frank Ch. Eigler <fche@redhat.com> | 2000-06-24 15:10:45 +0000 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@redhat.com> | 2000-06-24 15:10:45 +0000 |
| commit | a668b64c36bf005ee094af9ff10b7b5d9b17f9f1 (patch) | |
| tree | 92e92411f793b99cc8a5c905a4b8a96a04f399b9 /gas/cgen.c | |
| parent | 25788f3b8d79f783fa10e8a666e48dd7b62c37d7 (diff) | |
| download | binutils-redhat-a668b64c36bf005ee094af9ff10b7b5d9b17f9f1.tar.gz | |
* cgen assembler fixes; approved by original author <devans>
2000-06-24 Frank Ch. Eigler <fche@redhat.com>
* cgen.c (expr_jmp_buf_p): New validity flag for expr_jmp_buf.
(gas_cgen_parse_operand): Set it around expression() call.
(gas_cgen_md_operand): Test for it before longjmp().
Diffstat (limited to 'gas/cgen.c')
| -rw-r--r-- | gas/cgen.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gas/cgen.c b/gas/cgen.c index e15e1b6534..1f4ea0baeb 100644 --- a/gas/cgen.c +++ b/gas/cgen.c @@ -232,6 +232,7 @@ gas_cgen_record_fixup_exp (frag, where, insn, length, operand, opinfo, exp) /* Used for communication between the next two procedures. */ static jmp_buf expr_jmp_buf; +static int expr_jmp_buf_p; /* Callback for cgen interface. Parse the expression at *STRP. The result is an error message or NULL for success (in which case @@ -279,12 +280,15 @@ gas_cgen_parse_operand (cd, want, strP, opindex, opinfo, resultP, valueP) This is done via gas_cgen_md_operand. */ if (setjmp (expr_jmp_buf) != 0) { + expr_jmp_buf_p = 0; input_line_pointer = (char *) hold; * resultP_1 = CGEN_PARSE_OPERAND_RESULT_ERROR; return "illegal operand"; } + expr_jmp_buf_p = 1; expression (& exp); + expr_jmp_buf_p = 0; * strP = input_line_pointer; input_line_pointer = hold; @@ -328,7 +332,9 @@ void gas_cgen_md_operand (expressionP) expressionS * expressionP; { - longjmp (expr_jmp_buf, 1); + /* Don't longjmp if we're not called from within cgen_parse_operand(). */ + if (expr_jmp_buf_p) + longjmp (expr_jmp_buf, 1); } /* Finish assembling instruction INSN. |