From 6885b33e913e33c0f61e1de40729a65600429cf8 Mon Sep 17 00:00:00 2001 From: Julian Seward Date: Sun, 14 Apr 2002 13:01:38 +0000 Subject: [PATCH] * external namespace check * VG_(printf) format strings check git-svn-id: svn://svn.valgrind.org/valgrind/trunk@65 --- Makefile.am | 1 - addrcheck/Makefile.am | 1 - cachegrind/Makefile.am | 1 - corecheck/Makefile.am | 1 - coregrind/Makefile.am | 1 - coregrind/vg_memory.c | 4 ++-- coregrind/vg_scheduler.c | 9 +++++++-- coregrind/vg_signals.c | 2 +- helgrind/Makefile.am | 1 - lackey/Makefile.am | 1 - memcheck/Makefile.am | 1 - none/Makefile.am | 1 - vg_clientperms.c | 5 +++-- vg_memory.c | 4 ++-- vg_scheduler.c | 9 +++++++-- vg_signals.c | 2 +- 16 files changed, 23 insertions(+), 21 deletions(-) diff --git a/Makefile.am b/Makefile.am index ec6775eaee..6e1826a4e4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -54,7 +54,6 @@ valgrind_so_SOURCES = \ vg_to_ucode.c \ vg_translate.c \ vg_transtab.c \ - vg_valgrinq_dummy.c \ vg_vtagops.c valgrind_so_LDADD = \ diff --git a/addrcheck/Makefile.am b/addrcheck/Makefile.am index ec6775eaee..6e1826a4e4 100644 --- a/addrcheck/Makefile.am +++ b/addrcheck/Makefile.am @@ -54,7 +54,6 @@ valgrind_so_SOURCES = \ vg_to_ucode.c \ vg_translate.c \ vg_transtab.c \ - vg_valgrinq_dummy.c \ vg_vtagops.c valgrind_so_LDADD = \ diff --git a/cachegrind/Makefile.am b/cachegrind/Makefile.am index ec6775eaee..6e1826a4e4 100644 --- a/cachegrind/Makefile.am +++ b/cachegrind/Makefile.am @@ -54,7 +54,6 @@ valgrind_so_SOURCES = \ vg_to_ucode.c \ vg_translate.c \ vg_transtab.c \ - vg_valgrinq_dummy.c \ vg_vtagops.c valgrind_so_LDADD = \ diff --git a/corecheck/Makefile.am b/corecheck/Makefile.am index ec6775eaee..6e1826a4e4 100644 --- a/corecheck/Makefile.am +++ b/corecheck/Makefile.am @@ -54,7 +54,6 @@ valgrind_so_SOURCES = \ vg_to_ucode.c \ vg_translate.c \ vg_transtab.c \ - vg_valgrinq_dummy.c \ vg_vtagops.c valgrind_so_LDADD = \ diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am index ec6775eaee..6e1826a4e4 100644 --- a/coregrind/Makefile.am +++ b/coregrind/Makefile.am @@ -54,7 +54,6 @@ valgrind_so_SOURCES = \ vg_to_ucode.c \ vg_translate.c \ vg_transtab.c \ - vg_valgrinq_dummy.c \ vg_vtagops.c valgrind_so_LDADD = \ diff --git a/coregrind/vg_memory.c b/coregrind/vg_memory.c index 5e932fbcdd..731344d040 100644 --- a/coregrind/vg_memory.c +++ b/coregrind/vg_memory.c @@ -1629,7 +1629,7 @@ void VGM_(init_memory_audit) ( void ) VG_(panic)("vgm_init_memory_audit: can't determine data-seg end"); if (0) - VG_(printf)("DS END is %p\n", VGM_(curr_dataseg_end)); + VG_(printf)("DS END is %p\n", (void*)VGM_(curr_dataseg_end)); /* Read the list of errors to suppress. This should be found in the file specified by vg_clo_suppressions. */ @@ -1731,7 +1731,7 @@ UInt VG_(scan_all_valid_memory) ( void (*notify_word)( Addr, UInt ) ) if (0) VG_(printf)( "vg_scan_all_valid_memory_sighandler: ignoring page at %p\n", - pageBase + (void*)pageBase ); } } diff --git a/coregrind/vg_scheduler.c b/coregrind/vg_scheduler.c index dc3024e5a7..330bbde3f3 100644 --- a/coregrind/vg_scheduler.c +++ b/coregrind/vg_scheduler.c @@ -57,6 +57,9 @@ suitable for use by anyone at all! - Read/write syscall starts: don't crap out when the initial nonblocking read/write returns an error. +- Get rid of restrictions re use of sigaltstack; they are no longer + needed. + */ @@ -433,8 +436,8 @@ void VG_(scheduler_init) ( void ) startup_esp = VG_(baseBlock)[VGOFF_(m_esp)]; if ((startup_esp & VG_STARTUP_STACK_MASK) != VG_STARTUP_STACK_MASK) { - VG_(printf)("%esp at startup = %p is not near %p; aborting\n", - startup_esp, VG_STARTUP_STACK_MASK); + VG_(printf)("%%esp at startup = %p is not near %p; aborting\n", + (void*)startup_esp, (void*)VG_STARTUP_STACK_MASK); VG_(panic)("unexpected %esp at startup"); } @@ -685,6 +688,7 @@ void sched_do_syscall ( ThreadId tid ) possibly much later: it delivers the results from ready fds to threads in WaitFD state. */ +static void poll_for_ready_fds ( void ) { vki_ksigset_t saved_procmask; @@ -827,6 +831,7 @@ void poll_for_ready_fds ( void ) /* See comment attached to poll_for_ready_fds() for explaination. */ +static void complete_blocked_syscalls ( void ) { Int fd, i, res, syscall_no; diff --git a/coregrind/vg_signals.c b/coregrind/vg_signals.c index 4687e64e42..c03ebd1efc 100644 --- a/coregrind/vg_signals.c +++ b/coregrind/vg_signals.c @@ -481,7 +481,7 @@ void pp_vg_ksigaction ( vki_ksigaction* sa ) { Int i; VG_(printf)("vg_ksigaction: handler %p, flags 0x%x, restorer %p\n", - sa->ksa_handler, sa->ksa_flags, sa->ksa_restorer); + sa->ksa_handler, (UInt)sa->ksa_flags, sa->ksa_restorer); VG_(printf)("vg_ksigaction: { "); for (i = 1; i < VKI_KNSIG; i++) if (VG_(ksigismember(&(sa->ksa_mask),i))) diff --git a/helgrind/Makefile.am b/helgrind/Makefile.am index ec6775eaee..6e1826a4e4 100644 --- a/helgrind/Makefile.am +++ b/helgrind/Makefile.am @@ -54,7 +54,6 @@ valgrind_so_SOURCES = \ vg_to_ucode.c \ vg_translate.c \ vg_transtab.c \ - vg_valgrinq_dummy.c \ vg_vtagops.c valgrind_so_LDADD = \ diff --git a/lackey/Makefile.am b/lackey/Makefile.am index ec6775eaee..6e1826a4e4 100644 --- a/lackey/Makefile.am +++ b/lackey/Makefile.am @@ -54,7 +54,6 @@ valgrind_so_SOURCES = \ vg_to_ucode.c \ vg_translate.c \ vg_transtab.c \ - vg_valgrinq_dummy.c \ vg_vtagops.c valgrind_so_LDADD = \ diff --git a/memcheck/Makefile.am b/memcheck/Makefile.am index ec6775eaee..6e1826a4e4 100644 --- a/memcheck/Makefile.am +++ b/memcheck/Makefile.am @@ -54,7 +54,6 @@ valgrind_so_SOURCES = \ vg_to_ucode.c \ vg_translate.c \ vg_transtab.c \ - vg_valgrinq_dummy.c \ vg_vtagops.c valgrind_so_LDADD = \ diff --git a/none/Makefile.am b/none/Makefile.am index ec6775eaee..6e1826a4e4 100644 --- a/none/Makefile.am +++ b/none/Makefile.am @@ -54,7 +54,6 @@ valgrind_so_SOURCES = \ vg_to_ucode.c \ vg_translate.c \ vg_transtab.c \ - vg_valgrinq_dummy.c \ vg_vtagops.c valgrind_so_LDADD = \ diff --git a/vg_clientperms.c b/vg_clientperms.c index 8594a3eee5..15f3a3d2ad 100644 --- a/vg_clientperms.c +++ b/vg_clientperms.c @@ -286,7 +286,8 @@ void VG_(delete_client_stack_blocks_following_ESP_change) ( void ) vg_csb_discards++; if (VG_(clo_verbosity) > 2) VG_(printf)("discarding stack block %p for %d\n", - vg_csbs[vg_csb_used].start, vg_csbs[vg_csb_used].size); + (void*)vg_csbs[vg_csb_used].start, + vg_csbs[vg_csb_used].size); } } @@ -300,7 +301,7 @@ UInt VG_(handle_client_request) ( ThreadState* tst, UInt* arg_block ) if (VG_(clo_verbosity) > 2) VG_(printf)("client request: code %d, addr %p, len %d\n", - arg[0], arg[1], arg[2] ); + arg[0], (void*)arg[1], arg[2] ); vg_assert(VG_(clo_client_perms)); vg_assert(VG_(clo_instrument)); diff --git a/vg_memory.c b/vg_memory.c index 5e932fbcdd..731344d040 100644 --- a/vg_memory.c +++ b/vg_memory.c @@ -1629,7 +1629,7 @@ void VGM_(init_memory_audit) ( void ) VG_(panic)("vgm_init_memory_audit: can't determine data-seg end"); if (0) - VG_(printf)("DS END is %p\n", VGM_(curr_dataseg_end)); + VG_(printf)("DS END is %p\n", (void*)VGM_(curr_dataseg_end)); /* Read the list of errors to suppress. This should be found in the file specified by vg_clo_suppressions. */ @@ -1731,7 +1731,7 @@ UInt VG_(scan_all_valid_memory) ( void (*notify_word)( Addr, UInt ) ) if (0) VG_(printf)( "vg_scan_all_valid_memory_sighandler: ignoring page at %p\n", - pageBase + (void*)pageBase ); } } diff --git a/vg_scheduler.c b/vg_scheduler.c index dc3024e5a7..330bbde3f3 100644 --- a/vg_scheduler.c +++ b/vg_scheduler.c @@ -57,6 +57,9 @@ suitable for use by anyone at all! - Read/write syscall starts: don't crap out when the initial nonblocking read/write returns an error. +- Get rid of restrictions re use of sigaltstack; they are no longer + needed. + */ @@ -433,8 +436,8 @@ void VG_(scheduler_init) ( void ) startup_esp = VG_(baseBlock)[VGOFF_(m_esp)]; if ((startup_esp & VG_STARTUP_STACK_MASK) != VG_STARTUP_STACK_MASK) { - VG_(printf)("%esp at startup = %p is not near %p; aborting\n", - startup_esp, VG_STARTUP_STACK_MASK); + VG_(printf)("%%esp at startup = %p is not near %p; aborting\n", + (void*)startup_esp, (void*)VG_STARTUP_STACK_MASK); VG_(panic)("unexpected %esp at startup"); } @@ -685,6 +688,7 @@ void sched_do_syscall ( ThreadId tid ) possibly much later: it delivers the results from ready fds to threads in WaitFD state. */ +static void poll_for_ready_fds ( void ) { vki_ksigset_t saved_procmask; @@ -827,6 +831,7 @@ void poll_for_ready_fds ( void ) /* See comment attached to poll_for_ready_fds() for explaination. */ +static void complete_blocked_syscalls ( void ) { Int fd, i, res, syscall_no; diff --git a/vg_signals.c b/vg_signals.c index 4687e64e42..c03ebd1efc 100644 --- a/vg_signals.c +++ b/vg_signals.c @@ -481,7 +481,7 @@ void pp_vg_ksigaction ( vki_ksigaction* sa ) { Int i; VG_(printf)("vg_ksigaction: handler %p, flags 0x%x, restorer %p\n", - sa->ksa_handler, sa->ksa_flags, sa->ksa_restorer); + sa->ksa_handler, (UInt)sa->ksa_flags, sa->ksa_restorer); VG_(printf)("vg_ksigaction: { "); for (i = 1; i < VKI_KNSIG; i++) if (VG_(ksigismember(&(sa->ksa_mask),i))) -- 2.47.2