Module Name: src
Committed By: joerg
Date: Sat Feb 17 13:54:52 UTC 2018
Modified Files:
src/sys/arch/i386/stand/mbr: gptmbr.S
src/sys/arch/i386/stand/mbr/gptmbr: Makefile
Log Message:
Drop explicit loop prefix. GAS doesn't care and LLVM doesn't support it.
Drop the need for assembling with GAS. While LLVM is using a suboptimal
encoding of for hard-coded memory writes, it shouldn't affect
functionality. It just wastes three bytes with extra prefixes.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/i386/stand/mbr/gptmbr.S
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/i386/stand/mbr/gptmbr/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/stand/mbr/gptmbr.S
diff -u src/sys/arch/i386/stand/mbr/gptmbr.S:1.1 src/sys/arch/i386/stand/mbr/gptmbr.S:1.2
--- src/sys/arch/i386/stand/mbr/gptmbr.S:1.1 Wed Aug 17 00:25:05 2011
+++ src/sys/arch/i386/stand/mbr/gptmbr.S Sat Feb 17 13:54:52 2018
@@ -160,7 +160,7 @@ next:
get_ptab:
call read_sector
call inc64
- loopw get_ptab
+ loop get_ptab
/* Find the boot partition */
xorw %si,%si /* Nothing found yet */
@@ -182,7 +182,7 @@ find_part:
movw %di,%si
not_this:
addw %ax,%di
- loopw find_part
+ loop find_part
andw %si,%si
jnz found_part
Index: src/sys/arch/i386/stand/mbr/gptmbr/Makefile
diff -u src/sys/arch/i386/stand/mbr/gptmbr/Makefile:1.3 src/sys/arch/i386/stand/mbr/gptmbr/Makefile:1.4
--- src/sys/arch/i386/stand/mbr/gptmbr/Makefile:1.3 Wed Sep 21 18:15:59 2011
+++ src/sys/arch/i386/stand/mbr/gptmbr/Makefile Sat Feb 17 13:54:52 2018
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2011/09/21 18:15:59 jakllsch Exp $
+# $NetBSD: Makefile,v 1.4 2018/02/17 13:54:52 joerg Exp $
PROG= gptmbr.bin
SRCS= gptmbr.S
-AFLAGS.gptmbr.S= ${${ACTIVE_CC} == "clang":?-no-integrated-as:}
-
.include <../Makefile.mbr>
LOADADDR= 0x600
