From owner-p4-projects@FreeBSD.ORG  Sun Apr 13 15:48:59 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AEEE837B404; Sun, 13 Apr 2003 15:48:58 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6560D37B401
	for <perforce@freebsd.org>; Sun, 13 Apr 2003 15:48:58 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0D5DF43FAF
	for <perforce@freebsd.org>; Sun, 13 Apr 2003 15:48:58 -0700 (PDT)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h3DMmv0U027781
	for <perforce@freebsd.org>; Sun, 13 Apr 2003 15:48:57 -0700 (PDT)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3DMmvkP027778
	for perforce@freebsd.org; Sun, 13 Apr 2003 15:48:57 -0700 (PDT)
Date: Sun, 13 Apr 2003 15:48:57 -0700 (PDT)
Message-Id: <200304132248.h3DMmvkP027778@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 28893 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Apr 2003 22:48:59 -0000

http://perforce.freebsd.org/chv.cgi?CH=28893

Change 28893 by marcel@marcel_nfs on 2003/04/13 15:47:57

	Get truss(1) in sync. This needs to be double-checked when
	the EPC syscall code stabilizes. For now, it compiles.

Affected files ...

.. //depot/projects/ia64_epc/usr.bin/truss/ia64-fbsd.c#3 edit

Differences ...

==== //depot/projects/ia64_epc/usr.bin/truss/ia64-fbsd.c#3 (text+ko) ====

@@ -136,14 +136,14 @@
     fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n");
     return;
   }
-  parm_offset = regs.r_gr[12] + 16;
+  parm_offset = regs.r_special.sp + 16;
 
   /*
    * FreeBSD has two special kinds of system call redirctions --
    * SYS_syscall, and SYS___syscall.  The former is the old syscall()
    * routine, basicly; the latter is for quad-aligned arguments.
    */
-  syscall_num = regs.r_gr[15];
+  syscall_num = regs.r_scratch.gr15;		/* XXX double-check. */
   switch (syscall_num) {
   case SYS_syscall:
     lseek(Procfd, parm_offset, SEEK_SET);
@@ -293,8 +293,8 @@
     fprintf(trussinfo->outfile, "-- CANNOT READ REGISTERS --\n");
     return (-1);
   }
-  retval = regs.r_gr[8];
-  errorp = (regs.r_gr[10] != 0) ? 1 : 0;
+  retval = regs.r_scratch.gr8;
+  errorp = (regs.r_scratch.gr10 != 0) ? 1 : 0;
 
   /*
    * This code, while simpler than the initial versions I used, could