diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2011-04-09 21:30:28 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2011-04-09 21:30:28 +0000 |
| commit | bff071770f6cf9f9fb805580d77fa7cda1e0a8bf (patch) | |
| tree | 9483d40bf6f7c66733d381daeed4974c4f5645ce | |
| parent | dca7fad14991f47fc39509c5451268ca902f4165 (diff) | |
don't tell the inline assembly here it will take a 64 bit io port
value when this isn't possible in practice, use a 32 bit value.
ok kettenis@ miod@ oga@
| -rw-r--r-- | sys/arch/amd64/amd64/bus_space.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/sys/arch/amd64/amd64/bus_space.c b/sys/arch/amd64/amd64/bus_space.c index 8432ebdfa6e..4b476ae2cf1 100644 --- a/sys/arch/amd64/amd64/bus_space.c +++ b/sys/arch/amd64/amd64/bus_space.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bus_space.c,v 1.18 2010/12/26 15:40:59 miod Exp $ */ +/* $OpenBSD: bus_space.c,v 1.19 2011/04/09 21:30:27 jsg Exp $ */ /* $NetBSD: bus_space.c,v 1.2 2003/03/14 18:47:53 christos Exp $ */ /*- @@ -503,6 +503,7 @@ bus_space_read_region_1(bus_space_tag_t t, bus_space_handle_t h, void *dummy2; int dummy3; int __x; + u_int32_t port = h + o; __asm __volatile(" cld ;" "1: inb %w1,%%al ;" " stosb ;" @@ -510,7 +511,7 @@ bus_space_read_region_1(bus_space_tag_t t, bus_space_handle_t h, " loop 1b" : "=&a" (__x), "=d" (dummy1), "=D" (dummy2), "=c" (dummy3) : - "1" (h + o), "2" (ptr), "3" (cnt) : + "1" (port), "2" (ptr), "3" (cnt) : "memory"); } else { int dummy1; @@ -534,6 +535,7 @@ bus_space_read_region_2(bus_space_tag_t t, bus_space_handle_t h, void *dummy2; int dummy3; int __x; + u_int32_t port = h + o; __asm __volatile(" cld ;" "1: inw %w1,%%ax ;" " stosw ;" @@ -541,7 +543,7 @@ bus_space_read_region_2(bus_space_tag_t t, bus_space_handle_t h, " loop 1b" : "=&a" (__x), "=d" (dummy1), "=D" (dummy2), "=c" (dummy3) : - "1" ((h) + (o)), "2" ((ptr)), "3" ((cnt)) : + "1" ((port)), "2" ((ptr)), "3" ((cnt)) : "memory"); } else { int dummy1; @@ -565,6 +567,7 @@ bus_space_read_region_4(bus_space_tag_t t, bus_space_handle_t h, void *dummy2; int dummy3; int __x; + u_int32_t port = h + o; __asm __volatile("cld ;" "1: inl %w1,%%eax ;" " stosl ;" @@ -572,7 +575,7 @@ bus_space_read_region_4(bus_space_tag_t t, bus_space_handle_t h, " loop 1b" : "=&a" (__x), "=d" (dummy1), "=D" (dummy2), "=c" (dummy3) : - "1" (h + o), "2" (ptr), "3" (cnt) : + "1" (port), "2" (ptr), "3" (cnt) : "memory"); } else { int dummy1; @@ -693,6 +696,7 @@ bus_space_write_region_1(bus_space_tag_t t, bus_space_handle_t h, void *dummy2; int dummy3; int __x; + u_int32_t port = h + o; __asm __volatile("cld ;" "1: lodsb ;" " outb %%al,%w1 ;" @@ -700,7 +704,7 @@ bus_space_write_region_1(bus_space_tag_t t, bus_space_handle_t h, " loop 1b" : "=&a" (__x), "=d" (dummy1), "=S" (dummy2), "=c" (dummy3) : - "1" (h + o), "2" (ptr), "3" (cnt) : + "1" (port), "2" (ptr), "3" (cnt) : "memory"); } else { int dummy1; @@ -724,6 +728,7 @@ bus_space_write_region_2(bus_space_tag_t t, bus_space_handle_t h, void *dummy2; int dummy3; int __x; + u_int32_t port = h + o; __asm __volatile("cld ;" "1: lodsw ;" " outw %%ax,%w1 ;" @@ -731,7 +736,7 @@ bus_space_write_region_2(bus_space_tag_t t, bus_space_handle_t h, " loop 1b" : "=&a" (__x), "=d" (dummy1), "=S" (dummy2), "=c" (dummy3) : - "1" (h + o), "2" (ptr), "3" (cnt) : + "1" (port), "2" (ptr), "3" (cnt) : "memory"); } else { int dummy1; @@ -755,6 +760,7 @@ bus_space_write_region_4(bus_space_tag_t t, bus_space_handle_t h, void *dummy2; int dummy3; int __x; + u_int32_t port = h + o; __asm __volatile(" cld ;" "1: lodsl ;" " outl %%eax,%w1 ;" @@ -762,7 +768,7 @@ bus_space_write_region_4(bus_space_tag_t t, bus_space_handle_t h, " loop 1b" : "=&a" (__x), "=d" (dummy1), "=S" (dummy2), "=c" (dummy3) : - "1" (h + o), "2" (ptr), "3" (cnt) : + "1" (port), "2" (ptr), "3" (cnt) : "memory"); } else { int dummy1; |