Date: Sat, 1 Nov 2008 21:16:03 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 152328 for review Message-ID: <200811012116.mA1LG3WY032135@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=152328 Change 152328 by peter@peter_overcee on 2008/11/01 21:16:03 Fix warnings on i386. The UCONTEXT macros return 'long' all platforms except i386-freebsd, so that upset some printf strings. Cast them to long (instead of int) for freebsd rather than adding ifdefs to ``MI'' code. Affected files ... .. //depot/projects/valgrind/coregrind/m_coredump/priv_elf.h#3 edit .. //depot/projects/valgrind/coregrind/m_signals.c#8 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_coredump/priv_elf.h#3 (text+ko) ==== @@ -37,7 +37,7 @@ void ML_(fill_elffpregs_from_tst)(vki_elf_fpregset_t* fpu, const ThreadArchState* arch); -#if defined(VGP_x86_linux) +#if defined(VGP_x86_linux) || defined(VGP_x86_freebsd) void ML_(fill_elffpxregs_from_tst)(vki_elf_fpxregset_t* xfpu, const ThreadArchState* arch); #endif ==== //depot/projects/valgrind/coregrind/m_signals.c#8 (text+ko) ==== @@ -307,10 +307,10 @@ } #elif defined(VGP_x86_freebsd) -# define VG_UCONTEXT_INSTR_PTR(uc) ((uc)->uc_mcontext.eip) -# define VG_UCONTEXT_STACK_PTR(uc) ((uc)->uc_mcontext.esp) -# define VG_UCONTEXT_FRAME_PTR(uc) ((uc)->uc_mcontext.ebp) -# define VG_UCONTEXT_SYSCALL_NUM(uc) ((uc)->uc_mcontext.eax) +# define VG_UCONTEXT_INSTR_PTR(uc) ((UWord)(uc)->uc_mcontext.eip) +# define VG_UCONTEXT_STACK_PTR(uc) ((UWord)(uc)->uc_mcontext.esp) +# define VG_UCONTEXT_FRAME_PTR(uc) ((UWord)(uc)->uc_mcontext.ebp) +# define VG_UCONTEXT_SYSCALL_NUM(uc) ((UWord)(uc)->uc_mcontext.eax) # define VG_UCONTEXT_SYSCALL_SYSRES(uc) \ /* Convert the value in uc_mcontext.eax into a SysRes. */ \ VG_(mk_SysRes_x86_freebsd)( (uc)->uc_mcontext.eax, \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811012116.mA1LG3WY032135>