1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
|
From 1b2e218f16714358ffc0cbffedeaa36725f56819 Mon Sep 17 00:00:00 2001
From: Mahesh Bodapati <mbodapat@xilinx.com>
Date: Wed, 3 Nov 2021 12:13:32 +0530
Subject: [PATCH 27/38] Fixed bug in generation of IMML instruction for the
new MB-64 instructions with single register.
Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
---
gas/config/tc-microblaze.c | 50 +++++++++++++++++++++++++++++++++++---
1 file changed, 47 insertions(+), 3 deletions(-)
diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c
index 454d4875ee1..23c0d080d9d 100644
--- a/gas/config/tc-microblaze.c
+++ b/gas/config/tc-microblaze.c
@@ -1643,12 +1643,56 @@ md_assemble (char * str)
exp.X_add_symbol,
exp.X_add_number,
(char *) opc);
- immedl = 0L;
+ immed = 0L;
}
else
{
output = frag_more (isize);
immed = exp.X_add_number;
+ temp = ((long long)immed) & 0xFFFFFFFFFFFF8000;
+ if (temp != 0 && temp != 0xFFFFFFFFFFFF8000 && temp != 0x8000)
+ {
+ /* Needs an immediate inst. */
+ if (((long long)immed) > (long long)-549755813888 && ((long long)immed) < (long long)549755813887)
+ {
+ opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
+ if (opcode1 == NULL)
+ {
+ as_bad (_("unknown opcode \"%s\""), "imml");
+ return;
+ }
+ inst1 = opcode1->bit_sequence;
+ inst1 |= ((immed & 0x000000FFFFFF0000L) >> 16) & IMML_MASK;
+ output[0] = INST_BYTE0 (inst1);
+ output[1] = INST_BYTE1 (inst1);
+ output[2] = INST_BYTE2 (inst1);
+ output[3] = INST_BYTE3 (inst1);
+ output = frag_more (isize);
+ }
+ else {
+ opcode2 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
+ opcode1 = (struct op_code_struct *) str_hash_find (opcode_hash_control, "imml");
+ if (opcode1 == NULL || opcode2 == NULL)
+ {
+ as_bad (_("unknown opcode \"%s\""), "imml");
+ return;
+ }
+ inst1 = opcode2->bit_sequence;
+ inst1 |= ((immed & 0xFFFFFF0000000000L) >> 40) & IMML_MASK;
+ output[0] = INST_BYTE0 (inst1);
+ output[1] = INST_BYTE1 (inst1);
+ output[2] = INST_BYTE2 (inst1);
+ output[3] = INST_BYTE3 (inst1);
+ output = frag_more (isize);
+ inst1 = opcode1->bit_sequence;
+ inst1 |= ((immed & 0x000000FFFFFF0000L) >> 16) & IMML_MASK;
+ output[0] = INST_BYTE0 (inst1);
+ output[1] = INST_BYTE1 (inst1);
+ output[2] = INST_BYTE2 (inst1);
+ output[3] = INST_BYTE3 (inst1);
+ output = frag_more (isize);
+ }
+ }
}
inst |= (reg1 << RD_LOW) & RD_MASK;
inst |= (immed << IMM_LOW) & IMM16_MASK;
@@ -2146,8 +2190,8 @@ md_assemble (char * str)
streq (name, "breaid") ||
streq (name, "brai") || streq (name, "braid")))
{
- temp = immed & 0xFFFFFFFFFFFF8000;
- if (temp != 0)
+ temp = ((long long)immed) & 0xFFFFFFFFFFFF8000;
+ if (temp != 0 && temp != 0xFFFFFFFFFFFF8000 && temp != 0x8000)
{
/* Needs an immediate inst. */
if (((long long)immed) > (long long)-549755813888 && ((long long)immed) < (long long)549755813887)
--
2.25.1
|
