Skip to content

Commit

Permalink
[x86 setup] Fix assembly constraints
Browse files Browse the repository at this point in the history
Fix incorrect assembly constraints.  In particular, fix memory
constraints used inside push..pop, which can cause invalid operation
since gcc may generate %esp-relative references.

Additionally:

outl() should have "dN" not "dn".

query_mca() shouldn't listen 16/32-bit registers in an 8-bit only
context.

has_eflag(): the "mask" is only used well after both the stack pointer
and the output registers have been touched; this requires the output
registers to be earlyclobbers (=&) and the input to exclude memory (so
"ri", not "g").

Thanks to Etienne Lorrain and Chuck Ebbert for prompting this review.

Cc: Etienne Lorrain <etienne_lorrain@yahoo.fr>
Cc: Chuck Ebbert <cebbert@redhat.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
  • Loading branch information
H. Peter Anvin committed Jul 18, 2007
1 parent 9aa3909 commit 5593eaa
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion arch/i386/boot/boot.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ static inline u16 inw(u16 port)

static inline void outl(u32 v, u16 port)
{
asm volatile("outl %0,%1" : : "a" (v), "dn" (port));
asm volatile("outl %0,%1" : : "a" (v), "dN" (port));
}
static inline u32 inl(u32 port)
{
Expand Down
4 changes: 2 additions & 2 deletions arch/i386/boot/cpucheck.c
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ static int has_eflag(u32 mask)
"pushfl ; "
"popl %1 ; "
"popfl"
: "=r" (f0), "=r" (f1)
: "g" (mask));
: "=&r" (f0), "=&r" (f1)
: "ri" (mask));

return !!((f0^f1) & mask);
}
Expand Down
2 changes: 1 addition & 1 deletion arch/i386/boot/mca.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ int query_mca(void)
"setc %0 ; "
"movw %%es, %1 ; "
"popw %%es"
: "=acdSDm" (err), "=acdSDm" (es), "=b" (bx)
: "=acd" (err), "=acdSD" (es), "=b" (bx)
: "a" (0xc000));

if (err)
Expand Down
2 changes: 1 addition & 1 deletion arch/i386/boot/pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ static void move_kernel_around(void)
"popw %%ds ; "
"popw %%es"
: "+c" (dwords)
: "rm" (dst_seg), "rm" (src_seg)
: "r" (dst_seg), "r" (src_seg)
: "esi", "edi");

syssize -= paras;
Expand Down
2 changes: 1 addition & 1 deletion arch/i386/boot/video.c
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ static void restore_screen(void)
"1: rep;stosl ; "
"popw %%es"
: "+D" (dst), "+c" (npad)
: "bdSm" (video_segment),
: "bdS" (video_segment),
"a" (0x07200720));
}

Expand Down
2 changes: 1 addition & 1 deletion arch/i386/boot/voyager.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ int query_voyager(void)
"setc %0 ; "
"movw %%es, %1 ; "
"popw %%es"
: "=qm" (err), "=rm" (es), "=D" (di)
: "=q" (err), "=r" (es), "=D" (di)
: "a" (0xffc0));

if (err)
Expand Down

0 comments on commit 5593eaa

Please sign in to comment.