Changeset c8f70eb in mainline for uspace/lib/c/arch/ia32/include/ddi.h

Timestamp:

2011-08-20T17:04:52Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ac08cd9

Parents:

81bc309

Message:

pcc incompatible inline assembly rewritten in a more agreeable fashion.

File:

• uspace/lib/c/arch/ia32/include/ddi.h (modified) (6 diffs)

uspace/lib/c/arch/ia32/include/ddi.h

@@ -44 +44 @@
                 uint8_t val;
                 asm volatile (
-                        "inb %w1, %b0\n"
-                        : "=a" (val)
-                        : "d" (port)
+                        "inb %w[port], %b[val]\n"
+                        : [val] "=a" (val)
+                        : [port] "d" (port)
                 );
                 return val;
@@ -59 +59 @@
                 uint16_t val;
                 asm volatile (
-                        "inw %w1, %w0\n"
-                        : "=a" (val)
-                        : "d" (port)
+                        "inw %w[port], %w[val]\n"
+                        : [val] "=a" (val)
+                        : [port] "d" (port)
                 );
                 return val;
@@ -74 +74 @@
                 uint32_t val;
                 asm volatile (
-                        "inl %w1, %0\n"
-                        : "=a" (val)
-                        : "d" (port)
+                        "inl %w[port], %[val]\n"
+                        : [val] "=a" (val)
+                        : [port] "d" (port)
                 );
                 return val;
@@ -88 +88 @@
         if (port < (ioport8_t *) IO_SPACE_BOUNDARY) {
                 asm volatile (
-                        "outb %b0, %w1\n"
-                        :: "a" (val), "d" (port)
+                        "outb %b[val], %w[port]\n"
+                        :: [val] "a" (val), [port] "d" (port)
                 );      
         } else {
@@ -100 +100 @@
         if (port < (ioport16_t *) IO_SPACE_BOUNDARY) {
                 asm volatile (
-                        "outw %w0, %w1\n"
-                        :: "a" (val), "d" (port)
+                        "outw %w[val], %w[port]\n"
+                        :: [val] "a" (val), [port] "d" (port)
                 );
         } else {
@@ -112 +112 @@
         if (port < (ioport32_t *) IO_SPACE_BOUNDARY) {
                 asm volatile (
-                        "outl %0, %w1\n"
-                        :: "a" (val), "d" (port)
+                        "outl %[val], %w[port]\n"
+                        :: [val] "a" (val), [port] "d" (port)
                 );
         } else {