Code Review / openocd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 3e0f34b)
target/nds32_disassembler: fix format specifiers warnings 78/1878/2
authorPaul Fertser <fercerpav@gmail.com>
Fri, 17 Jan 2014 10:11:55 +0000 (14:11 +0400)
committerSpencer Oliver <spen@spen-soft.co.uk>
Tue, 4 Feb 2014 21:18:27 +0000 (21:18 +0000)
According to the standard every operation returns at least an integer,
so PRIu8 format specifier is not suitable for these values as is.

This breaks build on OS X (x86_64-apple-darwin13.0.0) with "Apple LLVM
version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)".

Fix by adding appropriate casts. In fact there's plenty of room (and
I'd say necessity) for factoring out common code in there, but it's
too invasive for a non-maintainer.

Change-Id: I7d2182eb1d2f86fa22c882fbbaa6cfadf1c3e8fc
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-on: http://openocd.zylin.com/1878
Tested-by: jenkins
Reviewed-by: Xiaofan <xiaofanc@gmail.com>
Reviewed-by: Hsiangkai Wang <hsiangkai@gmail.com>
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
src/target/nds32_disassembler.c patch | blob | history

diff --git a/src/target/nds32_disassembler.c b/src/target/nds32_disassembler.c
index 761086e1dd2ea0dd1c50a1e51e2f5e9a7a93b921..8565f855f0f91ec407b9c964a7a4f77e0f021c64 100644 (file)
--- a/src/target/nds32_disassembler.c
+++ b/src/target/nds32_disassembler.c
@@ -2124,7 +2124,7 @@ static int nds32_parse_alu_2(uint32_t opcode, uint32_t address,
                                                 "0x%8.8" PRIx32 "\t0x%8.8" PRIx32
                                                 "\tMULTS64\t$D%" PRIu8 ",$r%" PRIu8 ",$r%" PRIu8,
                                                 address,
-                                                opcode, (dt_val >> 1) & 0x1, instruction->info.ra,
+                                                opcode, (uint8_t)((dt_val >> 1) & 0x1), instruction->info.ra,
                                                 instruction->info.rb);
                         }
                         break;
@@ -2139,7 +2139,7 @@ static int nds32_parse_alu_2(uint32_t opcode, uint32_t address,
                                                 "0x%8.8" PRIx32 "\t0x%8.8" PRIx32
                                                 "\tMULT64\t$D%" PRIu8 ",$r%" PRIu8 ",$r%" PRIu8,
                                                 address,
-                                                opcode, (dt_val >> 1) & 0x1, instruction->info.ra,
+                                                opcode, (uint8_t)((dt_val >> 1) & 0x1), instruction->info.ra,
                                                 instruction->info.rb);
                         }
                         break;
@@ -2153,7 +2153,7 @@ static int nds32_parse_alu_2(uint32_t opcode, uint32_t address,
                                                 "0x%8.8" PRIx32 "\t0x%8.8" PRIx32
                                                 "\tMADDS64\t$D%" PRIu8 ",$r%" PRIu8 ",$r%" PRIu8,
                                                 address,
-                                                opcode, (dt_val >> 1) & 0x1, instruction->info.ra,
+                                                opcode, (uint8_t)((dt_val >> 1) & 0x1), instruction->info.ra,
                                                 instruction->info.rb);
                         }
                         break;
@@ -2167,7 +2167,7 @@ static int nds32_parse_alu_2(uint32_t opcode, uint32_t address,
                                                 "0x%8.8" PRIx32 "\t0x%8.8" PRIx32
                                                 "\tMADD64\t$D%" PRIu8 ",$r%" PRIu8 ",$r%" PRIu8,
                                                 address,
-                                                opcode, (dt_val >> 1) & 0x1, instruction->info.ra,
+                                                opcode, (uint8_t)((dt_val >> 1) & 0x1), instruction->info.ra,
                                                 instruction->info.rb);
                         }
                         break;
@@ -2181,7 +2181,7 @@ static int nds32_parse_alu_2(uint32_t opcode, uint32_t address,
                                                 "0x%8.8" PRIx32 "\t0x%8.8" PRIx32
                                                 "\tMSUBS64\t$D%" PRIu8 ",$r%" PRIu8 ",$r%" PRIu8,
                                                 address,
-                                                opcode, (dt_val >> 1) & 0x1, instruction->info.ra,
+                                                opcode, (uint8_t)((dt_val >> 1) & 0x1), instruction->info.ra,
                                                 instruction->info.rb);
                         }
                         break;
@@ -2195,7 +2195,7 @@ static int nds32_parse_alu_2(uint32_t opcode, uint32_t address,
                                                 "0x%8.8" PRIx32 "\t0x%8.8" PRIx32
                                                 "\tMSUB64\t$D%" PRIu8 ",$r%" PRIu8 ",$r%" PRIu8,
                                                 address,
-                                                opcode, (dt_val >> 1) & 0x1, instruction->info.ra,
+                                                opcode, (uint8_t)((dt_val >> 1) & 0x1), instruction->info.ra,
                                                 instruction->info.rb);
                         }
                         break;
@@ -2209,7 +2209,7 @@ static int nds32_parse_alu_2(uint32_t opcode, uint32_t address,
                                                 "0x%8.8" PRIx32 "\t0x%8.8" PRIx32
                                                 "\tDIVS\t$D%" PRIu8 ",$r%" PRIu8 ",$r%" PRIu8,
                                                 address,
-                                                opcode, (dt_val >> 1) & 0x1, instruction->info.ra,
+                                                opcode, (uint8_t)((dt_val >> 1) & 0x1), instruction->info.ra,
                                                 instruction->info.rb);
                         }
                         break;
@@ -2223,7 +2223,7 @@ static int nds32_parse_alu_2(uint32_t opcode, uint32_t address,
                                                 "0x%8.8" PRIx32 "\t0x%8.8" PRIx32
                                                 "\tDIV\t$D%" PRIu8 ",$r%" PRIu8 ",$r%" PRIu8,
                                                 address,
-                                                opcode, (dt_val >> 1) & 0x1, instruction->info.ra,
+                                                opcode, (uint8_t)((dt_val >> 1) & 0x1), instruction->info.ra,
                                                 instruction->info.rb);
                         }
                         break;
@@ -2237,7 +2237,7 @@ static int nds32_parse_alu_2(uint32_t opcode, uint32_t address,
                                                 "0x%8.8" PRIx32 "\t0x%8.8" PRIx32
                                                 "\tMULT32\t$D%" PRIu8 ",$r%" PRIu8 ",$r%" PRIu8,
                                                 address,
-                                                opcode, (dt_val >> 1) & 0x1, instruction->info.ra,
+                                                opcode, (uint8_t)((dt_val >> 1) & 0x1), instruction->info.ra,
                                                 instruction->info.rb);
                         }
                         break;
@@ -2251,7 +2251,7 @@ static int nds32_parse_alu_2(uint32_t opcode, uint32_t address,
                                                 "0x%8.8" PRIx32 "\t0x%8.8" PRIx32
                                                 "\tMADD32\t$D%" PRIu8 ",$r%" PRIu8 ",$r%" PRIu8,
                                                 address,
-                                                opcode, (dt_val >> 1) & 0x1, instruction->info.ra,
+                                                opcode, (uint8_t)((dt_val >> 1) & 0x1), instruction->info.ra,
                                                 instruction->info.rb);
                         }
                         break;
@@ -2265,7 +2265,7 @@ static int nds32_parse_alu_2(uint32_t opcode, uint32_t address,
                                                 "0x%8.8" PRIx32 "\t0x%8.8" PRIx32
                                                 "\tMSUB32\t$D%" PRIu8 ",$r%" PRIu8 ",$r%" PRIu8,
                                                 address,
-                                                opcode, (dt_val >> 1) & 0x1, instruction->info.ra,
+                                                opcode, (uint8_t)((dt_val >> 1) & 0x1), instruction->info.ra,
                                                 instruction->info.rb);
                         }
                         break;
@@ -3546,7 +3546,7 @@ static int nds32_parse_group_3_insn_16(struct nds32 *nds32, uint16_t opcode,
                                                                "0x%8.8" PRIx32 "\t0x%4.4" PRIx16
                                                                "\t\tBREAK16\t#%" PRId16,
                                                                address,
-                                                               opcode, opcode & 0x1F);
+                                                               opcode, (int16_t)(opcode & 0x1F));
                                        } else { /* EX9.IT */
                                                instruction->type = NDS32_INSN_MISC;
                                                /* TODO: implement real instruction semantics */
@@ -3555,7 +3555,7 @@ static int nds32_parse_group_3_insn_16(struct nds32 *nds32, uint16_t opcode,
                                                                "0x%8.8" PRIx32 "\t0x%4.4" PRIx16
                                                                "\t\tEX9.IT\t#%" PRId16,
                                                                address,
-                                                               opcode, opcode & 0x1FF);
+                                                               opcode, (int16_t)(opcode & 0x1FF));
                                        }
                                        break;
                                case 2: /* ADDI10S */
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)