mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-01-24 12:35:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

CSKY: Add warning when -mdsp and -mcpu=ck803ern are both added.

Browse Source 
gas/
	* config/tc-csky.c (md_begin): Add warning when -mdsp and
 	-mcpu=ck803ern are both added.
 	(parse_ldst_imm): Fix error message.
This commit is contained in:
Cooper Qu 2020-08-31 10:55:06 +08:00 committed by Lifang Xia
parent 18856f435e
commit dd221981c4
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gas/ChangeLog
View File

@ -1,3 +1,9 @@
2020-08-31 Cooper Qu <cooper.qu@linux.alibaba.com>
* config/tc-csky.c (md_begin): Add warning when -mdsp and
-mcpu=ck803ern are both added.
(parse_ldst_imm): Fix error message.
2020-08-30 Alan Modra <amodra@gmail.com>
* testsuite/gas/cr16/cbitb_test.d: Update expected output.

19
gas/config/tc-csky.c
View File

@ -1359,8 +1359,20 @@ md_begin (void)
{
if ((dsp_flag & CSKY_DSP_FLAG_V1))
{
isa_flag |= (CSKY_ISA_MAC_DSP | CSKY_ISA_DSP);
isa_flag &= ~CSKY_ISA_DSP_ENHANCE;
if (isa_flag & CSKY_ISA_DSP_ENHANCE)
{
/* Option -mdsp conflicts with -mcpu=ck803ern,
CPU already indicates the dsp version. */
as_warn ("Option -mdsp conflicts with -mcpu=ck803ern which "
"has indicated DSP version, ignoring -mdsp.");
isa_flag &= ~(CSKY_ISA_MAC_DSP | CSKY_ISA_DSP);
isa_flag |= CSKY_ISA_DSP_ENHANCE;
}
else
{
isa_flag |= (CSKY_ISA_MAC_DSP | CSKY_ISA_DSP);
isa_flag &= ~CSKY_ISA_DSP_ENHANCE;
}
}
if ((dsp_flag & CSKY_DSP_FLAG_V2))
@ -2938,7 +2950,8 @@ parse_ldst_imm (char **oper, struct csky_opcode_info *op ATTRIBUTE_UNUSED,
if ((e.X_add_number % (1 << shift)) != 0)
{
/* Not aligned. */
SET_ERROR_NUMBER (ERROR_OFFSET_UNALIGNED, ((unsigned long)1 << shift));
SET_ERROR_NUMBER (ERROR_OFFSET_UNALIGNED,
(void *)"Operand format is error. eg. \"ld rz, (rx, n)\"");
return FALSE;
}