Changes in kernel/generic/src/ipc/irq.c [17b3cc6:55b77d9] in mainline

File:

• kernel/generic/src/ipc/irq.c (modified) (4 diffs)

kernel/generic/src/ipc/irq.c

@@ -42 +42 @@
  *
  * The structure of a notification message is as follows:
- * - IMETHOD: interface and method as registered by
- *            the SYS_IRQ_REGISTER syscall
+ * - IMETHOD: interface and method as registered by the SYS_REGISTER_IRQ
+ *            syscall
  * - ARG1: payload modified by a 'top-half' handler
  * - ARG2: payload modified by a 'top-half' handler
@@ -365 +365 @@
                 return IRQ_DECLINE;
         
+#define CMD_MEM_READ(target) \
+do { \
+        void *va = code->cmds[i].addr; \
+        if (AS != irq->driver_as) \
+                as_switch(AS, irq->driver_as); \
+        memcpy_from_uspace(&target, va, (sizeof(target))); \
+        if (dstarg) \
+                scratch[dstarg] = target; \
+} while(0)
+
+#define CMD_MEM_WRITE(val) \
+do { \
+        void *va = code->cmds[i].addr; \
+        if (AS != irq->driver_as) \
+                as_switch(AS, irq->driver_as); \
+        memcpy_to_uspace(va, &val, sizeof(val)); \
+} while (0)
+
         as_t *current_as = AS;
-        if (current_as != irq->driver_as)
-                as_switch(AS, irq->driver_as);
-        
-        for (size_t i = 0; i < code->cmdcount; i++) {
+        size_t i;
+        for (i = 0; i < code->cmdcount; i++) {
                 uint32_t dstval;
-                void *va;
-                uint8_t val8;
-                uint16_t val16;
-                uint32_t val32;
-                
                 uintptr_t srcarg = code->cmds[i].srcarg;
                 uintptr_t dstarg = code->cmds[i].dstarg;
@@ -431 +442 @@
                         }
                         break;
-                case CMD_MEM_READ_8:
-                        va = code->cmds[i].addr;
-                        memcpy_from_uspace(&val8, va, sizeof(val8));
-                        if (dstarg)
-                                scratch[dstarg] = val8;
-                        break;
-                case CMD_MEM_READ_16:
-                        va = code->cmds[i].addr;
-                        memcpy_from_uspace(&val16, va, sizeof(val16));
-                        if (dstarg)
-                                scratch[dstarg] = val16;
-                        break;
-                case CMD_MEM_READ_32:
-                        va = code->cmds[i].addr;
-                        memcpy_from_uspace(&val32, va, sizeof(val32));
-                        if (dstarg)
-                                scratch[dstarg] = val32;
-                        break;
-                case CMD_MEM_WRITE_8:
-                        val8 = code->cmds[i].value;
-                        va = code->cmds[i].addr;
-                        memcpy_to_uspace(va, &val8, sizeof(val8));
-                        break;
-                case CMD_MEM_WRITE_16:
-                        val16 = code->cmds[i].value;
-                        va = code->cmds[i].addr;
-                        memcpy_to_uspace(va, &val16, sizeof(val16));
-                        break;
-                case CMD_MEM_WRITE_32:
-                        val32 = code->cmds[i].value;
-                        va = code->cmds[i].addr;
-                        memcpy_to_uspace(va, &val32, sizeof(val32));
-                        break;
+                case CMD_MEM_READ_8: {
+                        uint8_t val;
+                        CMD_MEM_READ(val);
+                        break;
+                        }
+                case CMD_MEM_READ_16: {
+                        uint16_t val;
+                        CMD_MEM_READ(val);
+                        break;
+                        }
+                case CMD_MEM_READ_32: {
+                        uint32_t val;
+                        CMD_MEM_READ(val);
+                        break;
+                        }
+                case CMD_MEM_WRITE_8: {
+                        uint8_t val = code->cmds[i].value;
+                        CMD_MEM_WRITE(val);
+                        break;
+                        }
+                case CMD_MEM_WRITE_16: {
+                        uint16_t val = code->cmds[i].value;
+                        CMD_MEM_WRITE(val);
+                        break;
+                        }
+                case CMD_MEM_WRITE_32: {
+                        uint32_t val = code->cmds[i].value;
+                        CMD_MEM_WRITE(val);
+                        break;
+                        }
                 case CMD_MEM_WRITE_A_8:
                         if (srcarg) {
-                                val8 = scratch[srcarg];
-                                va = code->cmds[i].addr;
-                                memcpy_to_uspace(va, &val8, sizeof(val8));
+                                uint8_t val = scratch[srcarg];
+                                CMD_MEM_WRITE(val);
                         }
                         break;
                 case CMD_MEM_WRITE_A_16:
                         if (srcarg) {
-                                val16 = scratch[srcarg];
-                                va = code->cmds[i].addr;
-                                memcpy_to_uspace(va, &val16, sizeof(val16));
+                                uint16_t val = scratch[srcarg];
+                                CMD_MEM_WRITE(val);
                         }
                         break;
                 case CMD_MEM_WRITE_A_32:
                         if (srcarg) {
-                                val32 = scratch[srcarg];
-                                va = code->cmds[i].addr;
-                                memcpy_to_uspace(va, &val32, sizeof(val32));
+                                uint32_t val = scratch[srcarg];
+                                CMD_MEM_WRITE(val);
                         }
                         break;
@@ -508 +513 @@
                 }
         }
-        
         if (AS != current_as)
                 as_switch(AS, current_as);