Reviewed-by: Jordan Justen <jordan.l.jus...@intel.com> Please feel free to commit this change if you have time.
Thanks, -Jordan On Wed, Jan 16, 2013 at 10:56 AM, Andrew Fish <af...@apple.com> wrote: > Jordan, > > Thanks for the quick patch and fixing my bug leaving out the REX prefix, as I > did not realize it was required. > > This patch does not assemble for Xcode due to ; not being seen as a comment. > > Contributed-under: TianoCore Contribution Agrement 1.0 > signed-off-by: Andrew Fish <af...@apple.com> > > svn diff --diff-cmd diff > Index: Library/LoadLinuxLib/X64/JumpToKernel.S > =================================================================== > --- Library/LoadLinuxLib/X64/JumpToKernel.S (revision 14058) > +++ Library/LoadLinuxLib/X64/JumpToKernel.S (working copy) > @@ -34,7 +34,7 @@ > pushq $0x10 > leaq 1f(%rip), %rax > pushq %rax > - .byte 0x48, 0xcb ; retfq > + .byte 0x48, 0xcb // retfq > > 1: // Now in compatibility mode > .code32 > > > Andrew Fish > > > > On Jan 15, 2013, at 10:50 PM, jljus...@users.sourceforge.net wrote: > >> Revision: 14055 >> http://edk2.svn.sourceforge.net/edk2/?rev=14055&view=rev >> Author: jljusten >> Date: 2013-01-16 06:50:35 +0000 (Wed, 16 Jan 2013) >> Log Message: >> ----------- >> OvmfPkg: Fix Xcode assembly issue >> >> The Xcode assembler is much pickier than GCC. Also the 64-bit >> linker is not a fan of relocations so it is better to us IP >> relative code, but at least it removes a relocation entry. >> >> Contributed-under: TianoCore Contribution Agreement 1.0 >> Signed-off-by: Andrew Fish <af...@apple.com> >> [jordan.l.jus...@intel.com: use .byte for retfq rather than lret] >> Signed-off-by: Jordan Justen <jordan.l.jus...@intel.com> >> >> Modified Paths: >> -------------- >> trunk/edk2/OvmfPkg/Library/LoadLinuxLib/X64/JumpToKernel.S >> >> Modified: trunk/edk2/OvmfPkg/Library/LoadLinuxLib/X64/JumpToKernel.S >> =================================================================== >> --- trunk/edk2/OvmfPkg/Library/LoadLinuxLib/X64/JumpToKernel.S >> 2013-01-16 06:50:21 UTC (rev 14054) >> +++ trunk/edk2/OvmfPkg/Library/LoadLinuxLib/X64/JumpToKernel.S >> 2013-01-16 06:50:35 UTC (rev 14055) >> @@ -32,9 +32,9 @@ >> >> // Jump into the compatibility mode CS >> pushq $0x10 >> - leaq 1f, %rax >> + leaq 1f(%rip), %rax >> pushq %rax >> - retfq >> + .byte 0x48, 0xcb ; retfq >> >> 1: // Now in compatibility mode >> .code32 > > > ------------------------------------------------------------------------------ > Master Java SE, Java EE, Eclipse, Spring, Hibernate, JavaScript, jQuery > and much more. Keep your Java skills current with LearnJavaNow - > 200+ hours of step-by-step video tutorials by Java experts. > SALE $49.99 this month only -- learn more at: > http://p.sf.net/sfu/learnmore_122612 > _______________________________________________ > edk2-commits mailing list > edk2-comm...@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/edk2-commits ------------------------------------------------------------------------------ Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS, MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft MVPs and experts. SALE $99.99 this month only -- learn more at: http://p.sf.net/sfu/learnmore_122912 _______________________________________________ edk2-devel mailing list edk2-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/edk2-devel
