Sat Jul 13 21:53:48 2019 UTC ()
Add (ULONGEST) to prevent narrowing warnings.


(christos)
diff -r1.5 -r1.6 src/external/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.c

cvs diff -r1.5 -r1.6 src/external/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.c (expand / switch to unified diff)

--- src/external/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.c 2019/05/30 13:54:20 1.5
+++ src/external/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.c 2019/07/13 21:53:48 1.6
@@ -182,62 +182,62 @@ alphanbsd_sigtramp_cache_init (const str @@ -182,62 +182,62 @@ alphanbsd_sigtramp_cache_init (const str
182 CORE_ADDR); 182 CORE_ADDR);
183/* Under NetBSD/alpha, signal handler invocations can be identified by the 183/* Under NetBSD/alpha, signal handler invocations can be identified by the
184 designated code sequence that is used to return from a signal handler. 184 designated code sequence that is used to return from a signal handler.
185 In particular, the return address of a signal handler points to the 185 In particular, the return address of a signal handler points to the
186 following code sequences: */ 186 following code sequences: */
187static const struct tramp_frame alphanbsd_sigtramp_sc1 = { 187static const struct tramp_frame alphanbsd_sigtramp_sc1 = {
188 SIGTRAMP_FRAME, 188 SIGTRAMP_FRAME,
189 4, 189 4,
190 { 190 {
191 { 0xa61e0000, 0xffffffff }, /* ldq a0, 0(sp) */ 191 { 0xa61e0000, 0xffffffff }, /* ldq a0, 0(sp) */
192 { 0x23de0010, 0xffffffff }, /* lda sp, 16(sp) */ 192 { 0x23de0010, 0xffffffff }, /* lda sp, 16(sp) */
193 { 0x201f0127, 0xffffffff }, /* lda v0, 295 */ 193 { 0x201f0127, 0xffffffff }, /* lda v0, 295 */
194 { 0x00000083, 0xffffffff }, /* call_pal callsys */ 194 { 0x00000083, 0xffffffff }, /* call_pal callsys */
195 { TRAMP_SENTINEL_INSN, -1 } 195 { TRAMP_SENTINEL_INSN, (ULONGEST)-1 }
196 }, 196 },
197 alphanbsd_sigtramp_cache_init 197 alphanbsd_sigtramp_cache_init
198}; 198};
199 199
200/* The siginfo signal trampoline for NetBSD/alpha introduced in 2.0 */ 200/* The siginfo signal trampoline for NetBSD/alpha introduced in 2.0 */
201static const struct tramp_frame alphanbsd_sigtramp_si2 = 201static const struct tramp_frame alphanbsd_sigtramp_si2 =
202{ 202{
203 SIGTRAMP_FRAME, 203 SIGTRAMP_FRAME,
204 4, 204 4,
205 { 205 {
206 { 0x221e0080, -1 }, /* lda a0,128(sp) */ 206 { 0x221e0080, (ULONGEST)-1 }, /* lda a0,128(sp) */
207 { 0x201f0134, -1 }, /* lda v0,308 */ 207 { 0x201f0134, (ULONGEST)-1 }, /* lda v0,308 */
208 { 0x00000083, -1 }, /* callsys */ 208 { 0x00000083, (ULONGEST)-1 }, /* callsys */
209 { 0x47e00410, -1 }, /* mov v0,a0 */ 209 { 0x47e00410, (ULONGEST)-1 }, /* mov v0,a0 */
210 { 0x201f0001, -1 }, /* lda v0,1 */ 210 { 0x201f0001, (ULONGEST)-1 }, /* lda v0,1 */
211 { 0x00000083, -1 }, /* callsys */ 211 { 0x00000083, (ULONGEST)-1 }, /* callsys */
212 { TRAMP_SENTINEL_INSN, -1 } 212 { TRAMP_SENTINEL_INSN, (ULONGEST)-1 }
213 }, 213 },
214 alphanbsd_sigtramp_cache_init 214 alphanbsd_sigtramp_cache_init
215}; 215};
216/* The siginfo signal trampoline for NetBSD/alpha introduced in 4.0 */ 216/* The siginfo signal trampoline for NetBSD/alpha introduced in 4.0 */
217static const struct tramp_frame alphanbsd_sigtramp_si4 = 217static const struct tramp_frame alphanbsd_sigtramp_si4 =
218{ 218{
219 SIGTRAMP_FRAME, 219 SIGTRAMP_FRAME,
220 4, 220 4,
221 { 221 {
222 { 0x27ba0000, 0xffff0000 }, 222 { 0x27ba0000, 0xffff0000 },
223 { 0x23bd0000, 0xffff0000 }, /* ldgp gp,0(ra) */ 223 { 0x23bd0000, 0xffff0000 }, /* ldgp gp,0(ra) */
224 { 0x221e0080, -1 }, /* lda a0,128(sp) */ 224 { 0x221e0080, (ULONGEST)-1 }, /* lda a0,128(sp) */
225 { 0x201f0134, -1 }, /* lda v0,308 */ 225 { 0x201f0134, (ULONGEST)-1 }, /* lda v0,308 */
226 { 0x00000083, -1 }, /* callsys */ 226 { 0x00000083, (ULONGEST)-1 }, /* callsys */
227 { 0x221fffff, -1 }, /* lda a0,-1 */ 227 { 0x221fffff, (ULONGEST)-1 }, /* lda a0,-1 */
228 { 0x201f0001, -1 }, /* lda v0,1 */ 228 { 0x201f0001, (ULONGEST)-1 }, /* lda v0,1 */
229 { 0x00000083, -1 }, /* callsys */ 229 { 0x00000083, (ULONGEST)-1 }, /* callsys */
230 { TRAMP_SENTINEL_INSN, -1 } 230 { TRAMP_SENTINEL_INSN, (ULONGEST)-1 }
231 }, 231 },
232 alphanbsd_sigtramp_cache_init 232 alphanbsd_sigtramp_cache_init
233}; 233};
234 234
235static void 235static void
236alphanbsd_sigtramp_cache_init (const struct tramp_frame *self, 236alphanbsd_sigtramp_cache_init (const struct tramp_frame *self,
237 struct frame_info *this_frame, 237 struct frame_info *this_frame,
238 struct trad_frame_cache *this_cache, 238 struct trad_frame_cache *this_cache,
239 CORE_ADDR func) 239 CORE_ADDR func)
240{ 240{
241 struct gdbarch *gdbarch = get_frame_arch (this_frame); 241 struct gdbarch *gdbarch = get_frame_arch (this_frame);
242 struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); 242 struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
243 CORE_ADDR addr, sp; 243 CORE_ADDR addr, sp;