From owner-svn-soc-all@freebsd.org Mon Jul 27 07:20:20 2015 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9F2A49AC3B1 for ; Mon, 27 Jul 2015 07:20:20 +0000 (UTC) (envelope-from mihai@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 77809D00 for ; Mon, 27 Jul 2015 07:20:20 +0000 (UTC) (envelope-from mihai@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t6R7KKl4068793 for ; Mon, 27 Jul 2015 07:20:20 GMT (envelope-from mihai@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t6R7KJSS068622 for svn-soc-all@FreeBSD.org; Mon, 27 Jul 2015 07:20:19 GMT (envelope-from mihai@FreeBSD.org) Date: Mon, 27 Jul 2015 07:20:19 GMT Message-Id: <201507270720.t6R7KJSS068622@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to mihai@FreeBSD.org using -f From: mihai@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r288800 - soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm 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.20 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: Mon, 27 Jul 2015 07:20:20 -0000 Author: mihai Date: Mon Jul 27 07:20:19 2015 New Revision: 288800 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=288800 Log: soc2015: mihai: bhyve-arm: sys: arm: vmm: hyp_helpers.h: fix restoring SCTRL register [trashing r2 which retain the SCTRL] Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp_helpers.h Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp_helpers.h ============================================================================== --- soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp_helpers.h Mon Jul 27 07:16:51 2015 (r288799) +++ soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp_helpers.h Mon Jul 27 07:20:19 2015 (r288800) @@ -156,8 +156,8 @@ #define load_cp15_regs_batch3 \ mrc p15, 0, r2, c14, c1, 0; /* CNTKCTL */ \ - mrrc p15, 0, r3, r4, c7; /* PAR */ \ - mrc p15, 0, r5, c10, c3, 0; /* AMAIR0 */ \ + mrrc p15, 0, r4, r5, c7; /* PAR */ \ + mrc p15, 0, r3, c10, c3, 0; /* AMAIR0 */ \ mrc p15, 0, r6, c10, c3, 1 /* AMAIR1 */ #define store_cp15_regs_batch1 \ @@ -186,8 +186,8 @@ #define store_cp15_regs_batch3 \ mcr p15, 0, r2, c14, c1, 0; /* CNTKCTL */ \ - mcrr p15, 0, r3, r4, c7; /* PAR */ \ - mcr p15, 0, r5, c10, c3, 0; /* AMAIR0 */ \ + mcrr p15, 0, r4, r5, c7; /* PAR */ \ + mcr p15, 0, r3, c10, c3, 0; /* AMAIR0 */ \ mcr p15, 0, r6, c10, c3, 1 /* AMAIR1 */ #define store_guest_cp15_regs_batch1 \ @@ -228,10 +228,10 @@ ldr r3, [r0, #HYPCTX_CP15_CPACR]; \ ldr r4, [r0, #HYPCTX_CP15_TTBCR]; \ ldr r5, [r0, #HYPCTX_CP15_DACR]; \ - add r2, r0, #HYPCTX_CP15_TTBR0; \ - ldrd r6, r7, [r2]; \ - add r2, r0, #HYPCTX_CP15_TTBR1; \ - ldrd r8, r9, [r2]; \ + add r10, r0, #HYPCTX_CP15_TTBR0; \ + ldrd r6, r7, [r10]; \ + add r10, r0, #HYPCTX_CP15_TTBR1; \ + ldrd r8, r9, [r10]; \ ldr r10, [r0, #HYPCTX_CP15_PRRR]; \ ldr r11, [r0, #HYPCTX_CP15_NMRR]; \ ldr r12, [r0, #HYPCTX_CP15_CSSELR] @@ -251,8 +251,8 @@ #define load_guest_cp15_regs_batch3 \ ldr r2, [r0, #HYPCTX_CP15_CNTKCTL]; \ - add r2, r0, #HYPCTX_CP15_PAR; \ - ldrd r4, r5, [r2]; \ + add r3, r0, #HYPCTX_CP15_PAR; \ + ldrd r4, r5, [r3]; \ ldr r3, [r0, #HYPCTX_CP15_AMAIR0]; \ ldr r6, [r0, #HYPCTX_CP15_AMAIR1]