From owner-p4-projects@FreeBSD.ORG  Mon Jun 17 10:28:45 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id A5D3B5D2; Mon, 17 Jun 2013 10:28:45 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 67BFD5D0
 for <perforce@freebsd.org>; Mon, 17 Jun 2013 10:28:45 +0000 (UTC)
 (envelope-from jonathan@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks6.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5765719F4
 for <perforce@freebsd.org>; Mon, 17 Jun 2013 10:28:45 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r5HASjkC090656
 for <perforce@freebsd.org>; Mon, 17 Jun 2013 10:28:45 GMT
 (envelope-from jonathan@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r5HASjmP090653
 for perforce@freebsd.org; Mon, 17 Jun 2013 10:28:45 GMT
 (envelope-from jonathan@freebsd.org)
Date: Mon, 17 Jun 2013 10:28:45 GMT
Message-Id: <201306171028.r5HASjmP090653@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 jonathan@freebsd.org using -f
From: Jonathan Anderson <jonathan@FreeBSD.org>
Subject: PERFORCE change 229807 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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: Mon, 17 Jun 2013 10:28:45 -0000

http://p4web.freebsd.org/@@229807?ac=10

Change 229807 by jonathan@jonathan-on-zenith on 2013/06/17 10:28:40

	Better syscall prototype for amd64.

Affected files ...

.. //depot/projects/ctsrd/tesla/src/sys/sys/tesla-kernel.h#3 edit

Differences ...

==== //depot/projects/ctsrd/tesla/src/sys/sys/tesla-kernel.h#3 (text+ko) ====

@@ -36,24 +36,23 @@
  */
 
 /*
- * Un-protyped functions that we care about.
- *
- * XXXRW: Solution is actually to prototype them properly.  Some don't have
- * consistent prototypes across architectures.
+ * Convenient assertion wrappers for various scopes.
  */
+
+#if defined(__amd64__)
+extern void amd64_syscall(struct trapframe *, int);
+#define	TESLA_SYSCALL(x)	TESLA_WITHIN(amd64_syscall, x)
+#else
 extern void syscall(void);
-extern void trap_pfault(struct trapframe *, int, vm_offset_t);
-
-/*
- * Convenient assertion wrappers for various scopes.
- */
 #define	TESLA_SYSCALL(x)	TESLA_WITHIN(syscall, x)
+#endif
 
 /*
  * XXXRW: Not all architectures have a trap_pfault() function.  Can't use
  * vm_fault() as it is used in non-trap contexts -- e.g., PMAP initialisation.
  */
 #if 0
+extern void trap_pfault(struct trapframe *, int, vm_offset_t);
 #define	TESLA_PAGE_FAULT(x)	TESLA_WITHIN(trap_pfault, x)
 #else
 #define	TESLA_PAGE_FAULT(x)