Author: jkim
Date: Fri Nov 30 00:59:37 2012
New Revision: 243685
URL: http://svnweb.freebsd.org/changeset/base/243685
Log:
Tidy up inline assembly. No functional change.
Modified:
head/sys/amd64/pci/pci_cfgreg.c
head/sys/i386/pci/pci_cfgreg.c
Modified: head/sys/amd64/pci/pci_cfgreg.c
==============================================================================
--- head/sys/amd64/pci/pci_cfgreg.c Fri Nov 30 00:13:31 2012
(r243684)
+++ head/sys/amd64/pci/pci_cfgreg.c Fri Nov 30 00:59:37 2012
(r243685)
@@ -324,15 +324,15 @@ pciereg_cfgread(int bus, unsigned slot,
switch (bytes) {
case 4:
- __asm __volatile("mov %1, %%eax" : "=a" (data)
+ __asm __volatile("movl %1, %0" : "=a" (data)
: "m" (*(uint32_t *)va));
break;
case 2:
- __asm __volatile("movzwl %1, %%eax" : "=a" (data)
+ __asm __volatile("movzwl %1, %0" : "=a" (data)
: "m" (*(uint16_t *)va));
break;
case 1:
- __asm __volatile("movzbl %1, %%eax" : "=a" (data)
+ __asm __volatile("movzbl %1, %0" : "=a" (data)
: "m" (*(uint8_t *)va));
break;
}
@@ -354,16 +354,16 @@ pciereg_cfgwrite(int bus, unsigned slot,
switch (bytes) {
case 4:
- __asm __volatile("mov %%eax, %0" : "=m" (*(uint32_t *)va)
+ __asm __volatile("movl %1, %0" : "=m" (*(uint32_t *)va)
: "a" (data));
break;
case 2:
- __asm __volatile("mov %%ax, %0" : "=m" (*(uint16_t *)va)
- : "a" (data));
+ __asm __volatile("movw %1, %0" : "=m" (*(uint16_t *)va)
+ : "a" ((uint16_t)data));
break;
case 1:
- __asm __volatile("mov %%al, %0" : "=m" (*(uint8_t *)va)
- : "a" (data));
+ __asm __volatile("movb %1, %0" : "=m" (*(uint8_t *)va)
+ : "a" ((uint8_t)data));
break;
}
}
Modified: head/sys/i386/pci/pci_cfgreg.c
==============================================================================
--- head/sys/i386/pci/pci_cfgreg.c Fri Nov 30 00:13:31 2012
(r243684)
+++ head/sys/i386/pci/pci_cfgreg.c Fri Nov 30 00:59:37 2012
(r243685)
@@ -681,15 +681,15 @@ pciereg_cfgread(int bus, unsigned slot,
switch (bytes) {
case 4:
- __asm __volatile("mov %1, %%eax" : "=a" (data)
+ __asm __volatile("movl %1, %0" : "=a" (data)
: "m" (*(uint32_t *)va));
break;
case 2:
- __asm __volatile("movzwl %1, %%eax" : "=a" (data)
+ __asm __volatile("movzwl %1, %0" : "=a" (data)
: "m" (*(uint16_t *)va));
break;
case 1:
- __asm __volatile("movzbl %1, %%eax" : "=a" (data)
+ __asm __volatile("movzbl %1, %0" : "=a" (data)
: "m" (*(uint8_t *)va));
break;
}
@@ -718,16 +718,16 @@ pciereg_cfgwrite(int bus, unsigned slot,
switch (bytes) {
case 4:
- __asm __volatile("mov %%eax, %0" : "=m" (*(uint32_t *)va)
+ __asm __volatile("movl %1, %0" : "=m" (*(uint32_t *)va)
: "a" (data));
break;
case 2:
- __asm __volatile("mov %%ax, %0" : "=m" (*(uint16_t *)va)
- : "a" (data));
+ __asm __volatile("movw %1, %0" : "=m" (*(uint16_t *)va)
+ : "a" ((uint16_t)data));
break;
case 1:
- __asm __volatile("mov %%al, %0" : "=m" (*(uint8_t *)va)
- : "a" (data));
+ __asm __volatile("movb %1, %0" : "=m" (*(uint8_t *)va)
+ : "a" ((uint8_t)data));
break;
}
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
