diff options
| author | Yoshinori Sato <ysato@users.sourceforge.jp> | 2020-05-19 13:33:08 -0400 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@efficios.com> | 2020-05-19 13:33:52 -0400 |
| commit | 1d6ce4d31257e1ea49b3a1b257055bf8f7ff16af (patch) | |
| tree | b77c3f961e5f47b75e21337f9ccd0d05973912e0 | |
| parent | 6fd1d259e98354236fafd14ec05f3d6a377ede9f (diff) | |
| download | gdb-1d6ce4d31257e1ea49b3a1b257055bf8f7ff16af.zip gdb-1d6ce4d31257e1ea49b3a1b257055bf8f7ff16af.tar.gz gdb-1d6ce4d31257e1ea49b3a1b257055bf8f7ff16af.tar.bz2 | |
gdb: fix -Wtautological-overlap-compare error in h8300-tdep.c
Compiling with clang 11 gives us:
CXX h8300-tdep.o
/home/smarchi/src/binutils-gdb/gdb/h8300-tdep.c:225:21: error: overlapping comparisons always evaluate to false [-Werror,-Wtautological-overlap-compare]
if (disp < 0 && disp > 0xffffff)
~~~~~~~~~^~~~~~~~~~~~~~~~~~
/home/smarchi/src/binutils-gdb/gdb/h8300-tdep.c:203:17: error: overlapping comparisons always evaluate to false [-Werror,-Wtautological-overlap-compare]
if (disp < 0 && disp > 0xffffff)
~~~~~~~~~^~~~~~~~~~~~~~~~~~
/home/smarchi/src/binutils-gdb/gdb/h8300-tdep.c:184:17: error: overlapping comparisons always evaluate to false [-Werror,-Wtautological-overlap-compare]
if (disp < 0 && disp > 0xffffff)
~~~~~~~~~^~~~~~~~~~~~~~~~~~
Indeed, disp (of type LONGEST) can't be less than 0 and greater than
0xffffff.
Fix it by changing the way we check if disp is negative. Check the sign
bit of disp, which is a 24-bit number.
gdb/ChangeLog:
* h8300-tdep.c (h8300_is_argument_spill): Change how we check
whether disp is negative.
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/h8300-tdep.c | 13 |
2 files changed, 12 insertions, 6 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f086b5c..c439318 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2020-05-19 Yoshinori Sato <ysato@users.sourceforge.jp> + + * h8300-tdep.c (h8300_is_argument_spill): Change how we check + whether disp is negative. + 2020-05-19 Simon Marchi <simon.marchi@efficios.com> * symfile.h (struct symfile_segment_data) diff --git a/gdb/h8300-tdep.c b/gdb/h8300-tdep.c index 3c2f502..b569a23 100644 --- a/gdb/h8300-tdep.c +++ b/gdb/h8300-tdep.c @@ -178,10 +178,10 @@ h8300_is_argument_spill (struct gdbarch *gdbarch, CORE_ADDR pc) if (IS_MOVB_Rn24_SP (read_memory_unsigned_integer (pc + 2, 2, byte_order))) { - LONGEST disp = read_memory_integer (pc + 4, 4, byte_order); + ULONGEST disp = read_memory_unsigned_integer (pc + 4, 4, byte_order); /* ... and d:24 is negative. */ - if (disp < 0 && disp > 0xffffff) + if ((disp & 0x00800000) != 0) return 8; } } @@ -197,10 +197,10 @@ h8300_is_argument_spill (struct gdbarch *gdbarch, CORE_ADDR pc) if (IS_MOVW_Rn24_SP (read_memory_unsigned_integer (pc + 2, 2, byte_order))) { - LONGEST disp = read_memory_integer (pc + 4, 4, byte_order); + ULONGEST disp = read_memory_unsigned_integer (pc + 4, 4, byte_order); /* ... and d:24 is negative. */ - if (disp < 0 && disp > 0xffffff) + if ((disp & 0x00800000) != 0) return 8; } } @@ -219,10 +219,11 @@ h8300_is_argument_spill (struct gdbarch *gdbarch, CORE_ADDR pc) { if (IS_MOVL_Rn24_SP (read_memory_integer (pc + 4, 2, byte_order))) { - LONGEST disp = read_memory_integer (pc + 6, 4, byte_order); + ULONGEST disp = read_memory_unsigned_integer (pc + 6, 4, + byte_order); /* ... and d:24 is negative. */ - if (disp < 0 && disp > 0xffffff) + if ((disp & 0x00800000) != 0) return 10; } } |