Date: Wed, 19 Dec 2012 12:12:25 +0000 (UTC) From: "Cherry G. Mathew" <cherry@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r244427 - projects/amd64_xen_pv/sys/amd64/xen Message-ID: <201212191212.qBJCCP9v089877@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cherry Date: Wed Dec 19 12:12:24 2012 New Revision: 244427 URL: http://svnweb.freebsd.org/changeset/base/244427 Log: - Fix stack layout on return from exception via hypervisor_iret. This xen hypercall requires a return code at the bottom of the stack. Approved by: gibbs (implicit) Modified: projects/amd64_xen_pv/sys/amd64/xen/exception.S Modified: projects/amd64_xen_pv/sys/amd64/xen/exception.S ============================================================================== --- projects/amd64_xen_pv/sys/amd64/xen/exception.S Wed Dec 19 12:10:14 2012 (r244426) +++ projects/amd64_xen_pv/sys/amd64/xen/exception.S Wed Dec 19 12:12:24 2012 (r244427) @@ -131,10 +131,10 @@ subq $TF_ERR, %rsp #define TRAP_FRAME_EXIT_NOERR \ - addq $TF_RIP, %rsp + addq $TF_RIP + 8, %rsp #define TRAP_FRAME_EXIT_ERR \ - addq $TF_ERR, %rsp + addq $TF_ERR + 8, %rsp #define TRAP_PROLOGUE(a) \ movl $(a), TF_TRAPNO(%rsp) ; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212191212.qBJCCP9v089877>