Wibbles, thanks to Arnaud Desitter.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@1232

diff --git a/addrcheck/ac_main.c b/addrcheck/ac_main.c
index b94dbca51a65d12780ee0974b1ad1d45480398e4..7075061dd4bd3b514ce423a2a5536130e8f5826d 100644 (file)
--- a/addrcheck/ac_main.c
+++ b/addrcheck/ac_main.c
@@ -2349,7 +2349,7 @@ static void vg_show_reg_tags ( void )
    z_eflags = VG_(baseBlock)[VGOFF_(sh_eflags)];
    
    uint_to_bits(z_eflags, buf1);
-   VG_(message)(Vg_DebugMsg, "efl %\n", buf1);
+   VG_(message)(Vg_DebugMsg, "efl %s\n", buf1);
 
    uint_to_bits(z_eax, buf1);
    uint_to_bits(z_ebx, buf2);

diff --git a/coregrind/vg_scheduler.c b/coregrind/vg_scheduler.c
index acdb9f37505fc4d48daa241f3e4da55c60fddd4d..e023248e462f77419ee2da45cafde831987bb3c3 100644 (file)
--- a/coregrind/vg_scheduler.c
+++ b/coregrind/vg_scheduler.c
@@ -1959,7 +1959,7 @@ void do__set_or_get_detach ( ThreadId tid,
                SET_EDX(tid, 0);
                if (VG_(clo_trace_sched)) {
                   VG_(sprintf)(msg_buf,
-                     "tid %d not detached because %d in join-wait for it %d",
+                     "tid %d not detached because %d in join-wait for it",
                      det, i);
                   print_sched_event(tid, msg_buf);
                }

diff --git a/memcheck/mc_include.h b/memcheck/mc_include.h
index 2f9c905c2c431c734bd0128198e7cbbc32ee750b..732db24ebe8d0e599345164d58cee67da37cd8c1 100644 (file)
--- a/memcheck/mc_include.h
+++ b/memcheck/mc_include.h
@@ -161,9 +161,9 @@ extern void SK_(helper_value_check1_fail) ( void );
 extern void SK_(helper_value_check0_fail) ( void );
 
 /* Functions defined in vg_memcheck.c */
-extern void SK_(helperc_STOREV4) ( UInt, Addr );
-extern void SK_(helperc_STOREV2) ( UInt, Addr );
-extern void SK_(helperc_STOREV1) ( UInt, Addr );
+extern void SK_(helperc_STOREV4) ( Addr, UInt );
+extern void SK_(helperc_STOREV2) ( Addr, UInt );
+extern void SK_(helperc_STOREV1) ( Addr, UInt );
    
 extern UInt SK_(helperc_LOADV1) ( Addr );
 extern UInt SK_(helperc_LOADV2) ( Addr );

diff --git a/memcheck/mc_main.c b/memcheck/mc_main.c
index c2398db05f6302164c0188fefef5b6515338cc69..dcde8dc1293a6ddb5af22d7232e0aeb7f8e18daf 100644 (file)
--- a/memcheck/mc_main.c
+++ b/memcheck/mc_main.c
@@ -2186,7 +2186,7 @@ static void vg_show_reg_tags ( void )
    z_eflags = VG_(baseBlock)[VGOFF_(sh_eflags)];
    
    uint_to_bits(z_eflags, buf1);
-   VG_(message)(Vg_DebugMsg, "efl %\n", buf1);
+   VG_(message)(Vg_DebugMsg, "efl %s\n", buf1);
 
    uint_to_bits(z_eax, buf1);
    uint_to_bits(z_ebx, buf2);