From owner-svn-soc-all@FreeBSD.ORG Fri Jul 25 15:22:36 2014 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B4635EFF for ; Fri, 25 Jul 2014 15:22:36 +0000 (UTC) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 878772D28 for ; Fri, 25 Jul 2014 15:22:36 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6PFMaWG090350 for ; Fri, 25 Jul 2014 15:22:36 GMT (envelope-from op@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.8/8.14.8/Submit) id s6PFMaZo090166 for svn-soc-all@FreeBSD.org; Fri, 25 Jul 2014 15:22:36 GMT (envelope-from op@FreeBSD.org) Date: Fri, 25 Jul 2014 15:22:36 GMT Message-Id: <201407251522.s6PFMaZo090166@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to op@FreeBSD.org using -f From: op@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r271371 - soc2014/op/freebsd-base/sys/x86/include MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jul 2014 15:22:36 -0000 Author: op Date: Fri Jul 25 15:22:35 2014 New Revision: 271371 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271371 Log: KSP: added stringified version of NOPs, required by C inline assembly Signed-off-by: Oliver Pinter git: https://github.com/opntr/opBSD/tree/op/gsoc2014/smap+kpatch Modified: soc2014/op/freebsd-base/sys/x86/include/selfpatch-asmacros.h Modified: soc2014/op/freebsd-base/sys/x86/include/selfpatch-asmacros.h ============================================================================== --- soc2014/op/freebsd-base/sys/x86/include/selfpatch-asmacros.h Fri Jul 25 15:22:20 2014 (r271370) +++ soc2014/op/freebsd-base/sys/x86/include/selfpatch-asmacros.h Fri Jul 25 15:22:35 2014 (r271371) @@ -63,6 +63,30 @@ #define KSP_INSTR_NOP8 KSP_INSTR_INTEL_NOP8 #define KSP_INSTR_NOP9 KSP_INSTR_INTEL_NOP9 +/* + * stringified version needed by C sources, because __STRING and __XSTRING failed + */ +#define KSP_INSTR_INTEL_NOP1_C ".byte 0x90" +#define KSP_INSTR_INTEL_NOP2_C ".byte 0x66,0x90" +#define KSP_INSTR_INTEL_NOP3_C ".byte 0x0f,0x1f,0x00" +#define KSP_INSTR_INTEL_NOP4_C ".byte 0x0f,0x1f,0x40,0x00" +#define KSP_INSTR_INTEL_NOP5_C ".byte 0x0f,0x1f,0x44,0x00,0x00" +#define KSP_INSTR_INTEL_NOP6_C ".byte 0x66,0x0f,0x1f,0x44,0x00,0x00" +#define KSP_INSTR_INTEL_NOP7_C ".byte 0x0f,0x1f,0x80,0x00,0x00,0x00,0x00" +#define KSP_INSTR_INTEL_NOP8_C ".byte 0x0f,0x1f,0x84,0x00,0x00,0x00,0x00,0x00" +#define KSP_INSTR_INTEL_NOP9_C ".byte 0x66,0x0f,0x1f,0x84,0x00,0x00,0x00,0x00,0x00" + +#define KSP_INSTR_NOP1_C KSP_INSTR_INTEL_NOP1_C +#define KSP_INSTR_NOP2_C KSP_INSTR_INTEL_NOP2_C +#define KSP_INSTR_NOP3_C KSP_INSTR_INTEL_NOP3_C +#define KSP_INSTR_NOP4_C KSP_INSTR_INTEL_NOP4_C +#define KSP_INSTR_NOP5_C KSP_INSTR_INTEL_NOP5_C +#define KSP_INSTR_NOP6_C KSP_INSTR_INTEL_NOP6_C +#define KSP_INSTR_NOP7_C KSP_INSTR_INTEL_NOP7_C +#define KSP_INSTR_NOP8_C KSP_INSTR_INTEL_NOP8_C +#define KSP_INSTR_NOP9_C KSP_INSTR_INTEL_NOP9_C + + #define KSP_INSTR_XSAVE_XSAVEOPT(_ARG) \ 0723: \ xsave ( _ARG ) ; \