Fri Dec 6 00:55:48 1996 Martin <hunt@cygnus.com>

* config/tc-d10v.c (md_assemble): Check to see if prev_seg
	is initialized before using it.
	(d10v_cleanup): No longer uses its argument, so make it void.

	* config/tc-d10v.h (d10v_cleanup): Change prototype.
This commit is contained in:
Martin Hunt 1996-12-06 09:13:25 +00:00
parent e5a7a53799
commit f787a8d9b8
2 changed files with 15 additions and 11 deletions

View File

@ -1,8 +1,13 @@
Thu Dec 5 23:44:42 1996 Michael Meissner <meissner@tiktok.cygnus.com> start-sanitize-d10v
Fri Dec 6 00:55:48 1996 Martin <hunt@cygnus.com>
* config/tc-ppc.c (comment_char): Correctly define for non ELF * config/tc-d10v.c (md_assemble): Check to see if prev_seg
systems. is initialized before using it.
(d10v_cleanup): No longer uses its argument, so make it void.
* config/tc-d10v.h (d10v_cleanup): Change prototype.
end-sanitize-d10v
Thu Dec 5 11:03:31 1996 Ian Lance Taylor <ian@cygnus.com> Thu Dec 5 11:03:31 1996 Ian Lance Taylor <ian@cygnus.com>
* write.c (fixup_segment): Don't discard the symbol for a PC * write.c (fixup_segment): Don't discard the symbol for a PC

View File

@ -905,7 +905,7 @@ parallel_ok (op1, insn1, op2, insn2, exec_type)
static unsigned long prev_insn; static unsigned long prev_insn;
static struct d10v_opcode *prev_opcode = 0; static struct d10v_opcode *prev_opcode = 0;
static subsegT prev_subseg; static subsegT prev_subseg;
static segT prev_seg; static segT prev_seg = 0;;
void void
md_assemble (str) md_assemble (str)
@ -942,7 +942,7 @@ md_assemble (str)
/* if two instructions are present and we already have one saved /* if two instructions are present and we already have one saved
then first write it out */ then first write it out */
d10v_cleanup(0); d10v_cleanup();
/* assemble first instruction and save it */ /* assemble first instruction and save it */
prev_insn = do_assemble (str, &prev_opcode); prev_insn = do_assemble (str, &prev_opcode);
@ -975,15 +975,15 @@ md_assemble (str)
{ {
if (extype) if (extype)
as_fatal("Unable to mix instructions as specified"); as_fatal("Unable to mix instructions as specified");
d10v_cleanup(0); d10v_cleanup();
write_long (opcode, insn, fixups); write_long (opcode, insn, fixups);
prev_opcode = NULL; prev_opcode = NULL;
return; return;
} }
if (prev_opcode && ((prev_seg != now_seg) || (prev_subseg != now_subseg))) if (prev_opcode && prev_seg && ((prev_seg != now_seg) || (prev_subseg != now_subseg)))
d10v_cleanup(0); d10v_cleanup();
if (prev_opcode && (write_2_short (prev_opcode, prev_insn, opcode, insn, extype, fixups) == 0)) if (prev_opcode && (write_2_short (prev_opcode, prev_insn, opcode, insn, extype, fixups) == 0))
{ {
/* no instructions saved */ /* no instructions saved */
@ -1355,8 +1355,7 @@ md_apply_fix3 (fixp, valuep, seg)
instructions to see if it can package them with the next instruction, there may instructions to see if it can package them with the next instruction, there may
be a short instruction that still needs written. */ be a short instruction that still needs written. */
int int
d10v_cleanup (done) d10v_cleanup ()
int done;
{ {
segT seg; segT seg;
subsegT subseg; subsegT subseg;