darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* config/tc-dvp.c (assemble_dma): Do alignment before parsing insn.

Browse source 
(setup_dma_autocount): Renamed from setup_autocount.  New argument
	inline_p.  All callers changed.  Fix word address of count.
	(parse_dma_addr_autocount): Fix word address of address.
This commit is contained in:
Doug Evans 1998-02-24 00:00:18 +00:00
parent b35d842de7
commit e9cb12e459
2 changed files with 49 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gas/ChangeLog
View file

@ -1,4 +1,13 @@
start-sanitize-sky start-sanitize-sky
Mon Feb 23 15:55:12 1998 Doug Evans <devans@canuck.cygnus.com>
* config/tc-dvp.c (assemble_dma): Do alignment before parsing insn.
(setup_dma_autocount): Renamed from setup_autocount. New argument
inline_p. All callers changed. Fix word address of count.
(parse_dma_addr_autocount): Fix word address of address.
end-sanitize-sky
start-sanitize-sky
Mon Feb 23 17:24:06 1998 Jim Lemke <jlemke@cygnus.com> Mon Feb 23 17:24:06 1998 Jim Lemke <jlemke@cygnus.com>
* config/obj-elf.c: Take Ian's suggestion, leave .bss etc * config/obj-elf.c: Take Ian's suggestion, leave .bss etc

60
gas/config/tc-dvp.c
View file

@ -50,7 +50,7 @@ static char * unique_name PARAMS ((const char *));
static long eval_expr PARAMS ((int, int, const char *, ...)); static long eval_expr PARAMS ((int, int, const char *, ...));
static long parse_dma_addr_autocount (); static long parse_dma_addr_autocount ();
static void inline_dma_data PARAMS ((int, DVP_INSN *)); static void inline_dma_data PARAMS ((int, DVP_INSN *));
static void setup_autocount PARAMS ((const char *, DVP_INSN *)); static void setup_dma_autocount PARAMS ((const char *, DVP_INSN *, int));
static void insert_operand static void insert_operand
PARAMS ((dvp_cpu, const dvp_opcode *, const dvp_operand *, int, PARAMS ((dvp_cpu, const dvp_opcode *, const dvp_operand *, int,
@ -337,11 +337,20 @@ assemble_dma (str)
int i; int i;
const dvp_opcode *opcode; const dvp_opcode *opcode;
/* Fill the first two words with VIF NOPs. if (output_dma)
They may be over-written later if DmaPackPke is on. {
initialize the remainder with zeros. */ /* Do an implicit alignment to a 16 byte boundary.
Do it now so that inline dma data labels are at the right place. */
frag_align (4, 0, 0);
record_alignment (now_seg, 4);
}
/* This is the DMA tag. */
insn_buf[0] = 0; insn_buf[0] = 0;
insn_buf[1] = 0; insn_buf[1] = 0;
/* These are VIF NOPs.
They may be over-written later if DmaPackPke is on.
initialize the remainder with zeros. */
insn_buf[2] = 0; insn_buf[2] = 0;
insn_buf[3] = 0; insn_buf[3] = 0;
@ -353,10 +362,6 @@ assemble_dma (str)
if (!output_dma) if (!output_dma)
return; return;
/* Do an implicit alignment to a 16 byte boundary. */
frag_align (4, 0, 0);
record_alignment (now_seg, 4);
record_mach (DVP_DMA); record_mach (DVP_DMA);
len = 4; len = 4;
@ -1509,23 +1514,35 @@ unique_name (prefix)
return result; return result;
} }
/* Compute the auto-count value for a DMA tag. */ /* Compute the auto-count value for a DMA tag.
INLINE_P is non-zero if the dma data is inline. */
static void static void
setup_autocount (name, insn_buf) setup_dma_autocount (name, insn_buf, inline_p)
const char *name; const char *name;
DVP_INSN *insn_buf; DVP_INSN *insn_buf;
int inline_p;
{ {
long count; long count;
count = eval_expr (dma_operand_count, 12, if (inline_p)
"(%s%s - %s) >> 4", END_LABEL_PREFIX, name, name); {
/* count is in quadwords */ /* -1: The count is the number of following quadwords, so skip the one
count /= 16; containing the dma tag. */
count = eval_expr (dma_operand_count, 0,
"((%s%s - %s) >> 4) - 1", END_LABEL_PREFIX, name, name);
}
else
{
/* We don't want to subtract 1 here as the begin and end labels
properly surround the data we want to compute the length of. */
count = eval_expr (dma_operand_count, 0,
"(%s%s - %s) >> 4", END_LABEL_PREFIX, name, name);
}
/* Store the count field. */ /* Store the count field. */
insn_buf[3] &= 0xffff0000; insn_buf[0] &= 0xffff0000;
insn_buf[3] |= count & 0x0000ffff; insn_buf[0] |= count & 0x0000ffff;
} }
/* Record that inline data follows. */ /* Record that inline data follows. */
@ -1546,7 +1563,7 @@ inline_dma_data (autocount_p, insn_buf)
if (autocount_p) if (autocount_p)
{ {
dma_data_name = S_GET_NAME (create_colon_label ("", unique_name (NULL))); dma_data_name = S_GET_NAME (create_colon_label ("", unique_name (NULL)));
setup_autocount (dma_data_name, insn_buf); setup_dma_autocount (dma_data_name, insn_buf, 1);
} }
else else
dma_data_name = 0; dma_data_name = 0;
@ -1588,9 +1605,9 @@ parse_dma_addr_autocount (opcode, operand, mods, insn_buf, pstr, errmsg)
label2 = create_label ("_$", name); label2 = create_label ("_$", name);
endlabel = create_label (END_LABEL_PREFIX, name); endlabel = create_label (END_LABEL_PREFIX, name);
retval = eval_expr (dma_operand_addr, 8, name); retval = eval_expr (dma_operand_addr, 4, name);
setup_autocount (name, insn_buf); setup_dma_autocount (name, insn_buf, 0);
*pstr = end; *pstr = end;
return retval; return retval;
@ -1882,12 +1899,15 @@ s_enddmadata (ignore)
dma_data_state = 0; dma_data_state = 0;
demand_empty_rest_of_line (); demand_empty_rest_of_line ();
/* If count provided, verify it is correct. */
/* ... */
/* "label" points to beginning of block. /* "label" points to beginning of block.
Create a name for the final label like _$<name>. */ Create a name for the final label like _$<name>. */
if (dma_data_name) if (dma_data_name)
{ {
/* Fill the data out to a multiple of 16 bytes. */ /* Fill the data out to a multiple of 16 bytes. */
/* FIXME: Does the fill contents matter? */ /* FIXME: Are the fill contents right? */
frag_align (4, 0, 0); frag_align (4, 0, 0);
create_colon_label (END_LABEL_PREFIX, dma_data_name); create_colon_label (END_LABEL_PREFIX, dma_data_name);
} }