From owner-p4-projects@FreeBSD.ORG Tue Oct 28 11:37:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 12BA91065675; Tue, 28 Oct 2008 11:37:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CA722106566B for ; Tue, 28 Oct 2008 11:37:56 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BA7C28FC0C for ; Tue, 28 Oct 2008 11:37:56 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9SBbu8o098215 for ; Tue, 28 Oct 2008 11:37:56 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9SBbuIU098213 for perforce@freebsd.org; Tue, 28 Oct 2008 11:37:56 GMT (envelope-from peter-gmail@wemm.org) Date: Tue, 28 Oct 2008 11:37:56 GMT Message-Id: <200810281137.m9SBbuIU098213@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 152095 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Oct 2008 11:37:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=152095 Change 152095 by peter@peter_overcee on 2008/10/28 11:37:13 Get syscall encode/decode a little closer to reality. Affected files ... .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-main.c#8 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-main.c#8 (text+ko) ==== @@ -334,16 +334,32 @@ // AAA: missing 7th arg for freebsd/amd64 #elif defined(VGP_amd64_linux) || defined(VGP_amd64_freebsd) VexGuestAMD64State* gst = (VexGuestAMD64State*)gst_vanilla; - canonical->sysno = gst->guest_RAX; - canonical->arg1 = gst->guest_RDI; - canonical->arg2 = gst->guest_RSI; - canonical->arg3 = gst->guest_RDX; - canonical->arg4 = gst->guest_R10; - canonical->arg5 = gst->guest_R8; - canonical->arg6 = gst->guest_R9; - canonical->arg7 = 0; - canonical->arg8 = 0; - + ULong *argv = (void *)(ULong)gst->guest_RSP; + switch (gst->guest_RAX) { + default: + canonical->sysno = gst->guest_RAX; + canonical->arg1 = gst->guest_RDI; + canonical->arg2 = gst->guest_RSI; + canonical->arg3 = gst->guest_RDX; + canonical->arg4 = gst->guest_R10; + canonical->arg5 = gst->guest_R8; + canonical->arg6 = gst->guest_R9; + canonical->arg7 = argv[1]; + canonical->arg8 = argv[2]; + break; + case 198: + case 0: + canonical->sysno = gst->guest_RDI; + canonical->arg1 = gst->guest_RSI; + canonical->arg2 = gst->guest_RDX; + canonical->arg3 = gst->guest_R10; + canonical->arg4 = gst->guest_R8; + canonical->arg5 = gst->guest_R9; + canonical->arg6 = argv[1]; + canonical->arg7 = argv[2]; + canonical->arg8 = argv[2]; + break; + } #elif defined(VGP_ppc32_linux) VexGuestPPC32State* gst = (VexGuestPPC32State*)gst_vanilla; @@ -668,8 +684,7 @@ layout->o_arg8 = -1; /* impossible value */ layout->o_retval = OFFSET_x86_EAX; -// AAA: missing 7th arg for freebsd 64 bit (eg: mmap) -#elif defined(VGP_amd64_linux) || defined(VGP_amd64_freebsd) +#elif defined(VGP_amd64_linux) layout->o_sysno = OFFSET_amd64_RAX; layout->o_arg1 = OFFSET_amd64_RDI; layout->o_arg2 = OFFSET_amd64_RSI; @@ -742,6 +757,19 @@ layout->o_retval = OFFSET_x86_EAX; layout->o_retval2 = OFFSET_x86_EDX; +#elif defined(VGP_amd64_freebsd) + layout->o_sysno = OFFSET_amd64_RAX; + layout->o_arg1 = OFFSET_amd64_RDI; + layout->o_arg2 = OFFSET_amd64_RSI; + layout->o_arg3 = OFFSET_amd64_RDX; + layout->o_arg4 = OFFSET_amd64_R10; + layout->o_arg5 = OFFSET_amd64_R8; + layout->o_arg6 = OFFSET_amd64_R9; + layout->o_arg7 = 8; /* on stack */ + layout->o_arg8 = 16; /* on stack */ + layout->o_retval = OFFSET_amd64_RAX; + layout->o_retval2 = OFFSET_amd64_RDX; + #else # error "getSyscallLayout: unknown arch" #endif