From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KkMSq-0002mB-5h for qemu-devel@nongnu.org; Mon, 29 Sep 2008 13:23:16 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KkMSp-0002lq-O4 for qemu-devel@nongnu.org; Mon, 29 Sep 2008 13:23:15 -0400 Received: from [199.232.76.173] (port=42345 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KkMSp-0002lk-DA for qemu-devel@nongnu.org; Mon, 29 Sep 2008 13:23:15 -0400 Received: from savannah.gnu.org ([199.232.41.3]:57698 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KkMSo-0005qS-CK for qemu-devel@nongnu.org; Mon, 29 Sep 2008 13:23:15 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1KkMSk-0001xv-0h for qemu-devel@nongnu.org; Mon, 29 Sep 2008 17:23:10 +0000 Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1KkMSj-0001xn-Li for qemu-devel@nongnu.org; Mon, 29 Sep 2008 17:23:09 +0000 MIME-Version: 1.0 Errors-To: aurel32 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Aurelien Jarno Message-Id: Date: Mon, 29 Sep 2008 17:23:09 +0000 Subject: [Qemu-devel] [5356] TARGET_MAP_xx macros: clean and alpha specific values Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 5356 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5356 Author: aurel32 Date: 2008-09-29 17:23:09 +0000 (Mon, 29 Sep 2008) Log Message: ----------- TARGET_MAP_xx macros: clean and alpha specific values - Clean TARGET_MAP_xx macros to avoid nested #if #endif - Add alpha specific values Based on a patch by Tristan Gingold Modified Paths: -------------- trunk/linux-user/syscall_defs.h Modified: trunk/linux-user/syscall_defs.h =================================================================== --- trunk/linux-user/syscall_defs.h 2008-09-29 17:21:37 UTC (rev 5355) +++ trunk/linux-user/syscall_defs.h 2008-09-29 17:23:09 UTC (rev 5356) @@ -860,11 +860,14 @@ #include "termbits.h" +/* Common */ #define TARGET_MAP_SHARED 0x01 /* Share changes */ #define TARGET_MAP_PRIVATE 0x02 /* Changes are private */ -#define TARGET_MAP_TYPE 0x0f /* Mask for type of mapping */ +#define TARGET_MAP_TYPE 0x0f /* Mask for type of mapping */ + +/* Target specific */ +#if defined(TARGET_MIPS) #define TARGET_MAP_FIXED 0x10 /* Interpret addr exactly */ -#if defined(TARGET_MIPS) #define TARGET_MAP_ANONYMOUS 0x0800 /* don't use a file */ #define TARGET_MAP_GROWSDOWN 0x1000 /* stack-like segment */ #define TARGET_MAP_DENYWRITE 0x2000 /* ETXTBSY */ @@ -873,18 +876,34 @@ #define TARGET_MAP_NORESERVE 0x0400 /* don't check for reservations */ #define TARGET_MAP_POPULATE 0x10000 /* populate (prefault) pagetables */ #define TARGET_MAP_NONBLOCK 0x20000 /* do not block on IO */ -#else +#elif defined(TARGET_PPC) +#define TARGET_MAP_FIXED 0x10 /* Interpret addr exactly */ #define TARGET_MAP_ANONYMOUS 0x20 /* don't use a file */ #define TARGET_MAP_GROWSDOWN 0x0100 /* stack-like segment */ #define TARGET_MAP_DENYWRITE 0x0800 /* ETXTBSY */ #define TARGET_MAP_EXECUTABLE 0x1000 /* mark it as an executable */ -#if defined(TARGET_PPC) #define TARGET_MAP_LOCKED 0x0080 /* pages are locked */ #define TARGET_MAP_NORESERVE 0x0040 /* don't check for reservations */ +#define TARGET_MAP_POPULATE 0x8000 /* populate (prefault) pagetables */ +#define TARGET_MAP_NONBLOCK 0x10000 /* do not block on IO */ +#elif defined(TARGET_ALPHA) +#define TARGET_MAP_ANONYMOUS 0x10 /* don't use a file */ +#define TARGET_MAP_FIXED 0x100 /* Interpret addr exactly */ +#define TARGET_MAP_GROWSDOWN 0x01000 /* stack-like segment */ +#define TARGET_MAP_DENYWRITE 0x02000 /* ETXTBSY */ +#define TARGET_MAP_EXECUTABLE 0x04000 /* mark it as an executable */ +#define TARGET_MAP_LOCKED 0x08000 /* lock the mapping */ +#define TARGET_MAP_NORESERVE 0x10000 /* no check for reservations */ +#define TARGET_MAP_POPULATE 0x20000 /* pop (prefault) pagetables */ +#define TARGET_MAP_NONBLOCK 0x40000 /* do not block on IO */ #else +#define TARGET_MAP_FIXED 0x10 /* Interpret addr exactly */ +#define TARGET_MAP_ANONYMOUS 0x20 /* don't use a file */ +#define TARGET_MAP_GROWSDOWN 0x0100 /* stack-like segment */ +#define TARGET_MAP_DENYWRITE 0x0800 /* ETXTBSY */ +#define TARGET_MAP_EXECUTABLE 0x1000 /* mark it as an executable */ #define TARGET_MAP_LOCKED 0x2000 /* pages are locked */ #define TARGET_MAP_NORESERVE 0x4000 /* don't check for reservations */ -#endif #define TARGET_MAP_POPULATE 0x8000 /* populate (prefault) pagetables */ #define TARGET_MAP_NONBLOCK 0x10000 /* do not block on IO */ #endif