xnu-2050.24.15.tar.gz

[apple/xnu.git] / osfmk / mach / i386 / rpc.h

diff --git a/osfmk/mach/i386/rpc.h b/osfmk/mach/i386/rpc.h
index 002549ae8fabaa3778ab361e2e2a6949cbe2117d..55561f9eb8d892dac59591e514a4ff481e93c7e0 100644 (file)
--- a/osfmk/mach/i386/rpc.h
+++ b/osfmk/mach/i386/rpc.h
@@ -1,51 +1,36 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2002,2000 Apple Computer, Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.

  * 
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /*
  * @OSF_COPYRIGHT@
  */
  */
 /*
  * @OSF_COPYRIGHT@
  */

-#ifndef _MACH_I386_RPC_H_
-#define _MACH_I386_RPC_H_
-
-/*
- * Just temporary until all vestiges of short-circuit can be
- * removed.
- */
-#define CAN_SHCIRCUIT(name)    (0)

 
 

-/*
- * Kernel machine dependent macros for mach rpc
- *
- * User args (argv) begin two words above the frame pointer (past saved ebp 
- * and return address) on the user stack. Return code is stored in register
- * ecx, by convention (must be a caller-saves register, to survive return
- * from server work function). The user space instruction pointer is eip,
- * and the user stack pointer is uesp.
- */
-#define MACH_RPC_ARGV(act)     ( (char *)(USER_REGS(act)->ebp + 8) )
-#define MACH_RPC_RET(act)      ( USER_REGS(act)->ecx )
-#define MACH_RPC_FUNC(act)     ( USER_REGS(act)->edx )
-#define MACH_RPC_SIG(act)       ( USER_REGS(act)->edi ) 
-#define MACH_RPC_UIP(act)      ( USER_REGS(act)->eip )
-#define MACH_RPC_USP(act)      ( USER_REGS(act)->uesp )
-#define MACH_RPC_RETADDR(sp)    ( *((int *)sp - 1) )
+#ifndef        _MACH_I386_RPC_H_
+#define        _MACH_I386_RPC_H_

 
 #endif /* _MACH_I386_RPC_H_ */
 
 #endif /* _MACH_I386_RPC_H_ */

+