xnu-4903.221.2.tar.gz

[apple/xnu.git] / bsd / dev / munge.c

diff --git a/bsd/dev/munge.c b/bsd/dev/munge.c
index 168fad9295c754e84150d06a0e3e586541b9727f..e44a638d69ac6752620029be1da3286bace31e45 100644 (file)
--- a/bsd/dev/munge.c
+++ b/bsd/dev/munge.c
@@ -31,269 +31,295 @@
 #include <sys/munge.h>
 #include <stdint.h>
 
-static inline __attribute__((always_inline)) void 
-munge_32_to_64_unsigned(volatile uint64_t *dest, volatile uint32_t *src, int count);
-
 /*
  * Refer to comments in bsd/sys/munge.h
  */
+
+static inline __attribute__((always_inline)) void 
+munge_32_to_64_unsigned(volatile uint64_t *dest, volatile uint32_t *src, int count);
+
 void 
-munge_w(const void *arg0 __unused, void *args)
+munge_w(void *args)
 {
        munge_32_to_64_unsigned(args, args, 1);
 }
 
 void 
-munge_ww(const void *arg0 __unused, void *args)
+munge_ww(void *args)
 {
        munge_32_to_64_unsigned(args, args, 2);
 }
 
 void 
-munge_www(const void *arg0 __unused, void *args)
+munge_www(void *args)
 {
        munge_32_to_64_unsigned(args, args, 3);
 }
 
 void 
-munge_wwww(const void *arg0 __unused, void *args)
+munge_wwww(void *args)
 {
        munge_32_to_64_unsigned(args, args, 4);
 }
 
 void 
-munge_wwwww(const void *arg0 __unused, void *args)
+munge_wwwww(void *args)
 {
        munge_32_to_64_unsigned(args, args, 5);
 }
 
 void 
-munge_wwwwww(const void *arg0 __unused, void *args)
+munge_wwwwww(void *args)
 {
        munge_32_to_64_unsigned(args, args, 6);
 }
 
 void 
-munge_wwwwwww(const void *arg0 __unused, void *args)
+munge_wwwwwww(void *args)
 {
        munge_32_to_64_unsigned(args, args, 7);
 }
 
 void 
-munge_wwwwwwww(const void *arg0 __unused, void *args)
+munge_wwwwwwww(void *args)
 {
        munge_32_to_64_unsigned(args, args, 8);
 }
 
 void 
-munge_wl(const void *arg0 __unused, void *args)
+munge_wl(void *args)
 {
        volatile uint64_t *out_args = (volatile uint64_t*)args;
        volatile uint32_t *in_args = (volatile uint32_t*)args;
 
-       out_args[1] = *(uint64_t*)&in_args[1];
+       out_args[1] = *(volatile uint64_t*)&in_args[1];
        out_args[0] = in_args[0];
 }
 
 void 
-munge_wwl(const void *arg0 __unused, void *args)
+munge_wwl(void *args)
 {
        volatile uint64_t *out_args = (volatile uint64_t*)args;
        volatile uint32_t *in_args = (volatile uint32_t*)args;
 
-       out_args[2] = *(uint64_t*)&in_args[2];
+       out_args[2] = *(volatile uint64_t*)&in_args[2];
        out_args[1] = in_args[1];
        out_args[0] = in_args[0];
 }
 
 void 
-munge_wwlw(const void *arg0 __unused, void *args)
+munge_wwlw(void *args)
 {
        volatile uint64_t *out_args = (volatile uint64_t*)args;
        volatile uint32_t *in_args = (volatile uint32_t*)args;
 
        out_args[3] = in_args[4];
-       out_args[2] = *(uint64_t*)&in_args[2];
+       out_args[2] = *(volatile uint64_t*)&in_args[2];
        out_args[1] = in_args[1];
        out_args[0] = in_args[0];
 }
 void 
-munge_wwlll(const void *arg0 __unused, void *args)
+munge_wwlll(void *args)
 {
        volatile uint64_t *out_args = (volatile uint64_t*)args;
        volatile uint32_t *in_args = (volatile uint32_t*)args;
 
-       out_args[4] = *(uint64_t*)&in_args[6];
-       out_args[3] = *(uint64_t*)&in_args[4];
-       out_args[2] = *(uint64_t*)&in_args[2];
+       out_args[4] = *(volatile uint64_t*)&in_args[6];
+       out_args[3] = *(volatile uint64_t*)&in_args[4];
+       out_args[2] = *(volatile uint64_t*)&in_args[2];
        out_args[1] = in_args[1];
        out_args[0] = in_args[0];
 }
 
 void
-munge_wwllww(const void *arg0 __unused, void *args)
+munge_wwllww(void *args)
 {
        volatile uint64_t *out_args = (volatile uint64_t*)args;
        volatile uint32_t *in_args = (volatile uint32_t*)args;
 
        out_args[5] = in_args[7];
        out_args[4] = in_args[6];
-       out_args[3] = *(uint64_t*)&in_args[4];
-       out_args[2] = *(uint64_t*)&in_args[2];
+       out_args[3] = *(volatile uint64_t*)&in_args[4];
+       out_args[2] = *(volatile uint64_t*)&in_args[2];
        out_args[1] = in_args[1];
        out_args[0] = in_args[0];
 }
 
 void
-munge_wlw(const void *arg0 __unused, void *args)
+munge_wlw(void *args)
+{
+       volatile uint64_t *out_args = (volatile uint64_t*)args;
+       volatile uint32_t *in_args = (volatile uint32_t*)args;
+
+       out_args[2] = in_args[3];
+       out_args[1] = *(volatile uint64_t*)&in_args[1];
+       out_args[0] = in_args[0];
+}
+
+void
+munge_wlww(void *args)
 {
        volatile uint64_t *out_args = (volatile uint64_t*)args;
        volatile uint32_t *in_args = (volatile uint32_t*)args;
 
+       out_args[3] = in_args[4];
        out_args[2] = in_args[3];
-       out_args[1] = *(uint64_t*)&in_args[1];
+       out_args[1] = *(volatile uint64_t*)&in_args[1];
        out_args[0] = in_args[0];
 }
 
 void
-munge_wlwwwll(const void *arg0 __unused, void *args)
+munge_wlwwwll(void *args)
 {
        volatile uint64_t *out_args = (volatile uint64_t*)args;
        volatile uint32_t *in_args = (volatile uint32_t*)args;
 
-       out_args[6] = *(uint64_t*)&in_args[8];
-       out_args[5] = *(uint64_t*)&in_args[6];
+       out_args[6] = *(volatile uint64_t*)&in_args[8];
+       out_args[5] = *(volatile uint64_t*)&in_args[6];
        out_args[4] = in_args[5];
        out_args[3] = in_args[4];
        out_args[2] = in_args[3];
-       out_args[1] = *(uint64_t*)&in_args[1];
+       out_args[1] = *(volatile uint64_t*)&in_args[1];
        out_args[0] = in_args[0];
 }
 
 void
-munge_wlwwwllw(const void *arg0 __unused, void *args)
+munge_wlwwwllw(void *args)
 {
        volatile uint64_t *out_args = (volatile uint64_t*)args;
        volatile uint32_t *in_args = (volatile uint32_t*)args;
 
        out_args[7] = in_args[10];
-       munge_wlwwwll(args, args);
+       munge_wlwwwll(args);
 }
 
 void 
-munge_wlwwlwlw(const void *arg0 __unused, void *args)
+munge_wlwwlwlw(void *args)
 {
        volatile uint64_t *out_args = (volatile uint64_t*)args;
        volatile uint32_t *in_args = (volatile uint32_t*)args;
 
        out_args[7] = in_args[10];
-       out_args[6] = *(uint64_t*)&in_args[8];
+       out_args[6] = *(volatile uint64_t*)&in_args[8];
        out_args[5] = in_args[7];
-       out_args[4] = *(uint64_t*)&in_args[5];
+       out_args[4] = *(volatile uint64_t*)&in_args[5];
        out_args[3] = in_args[4];
        out_args[2] = in_args[3];
-       out_args[1] = *(uint64_t*)&in_args[1];
+       out_args[1] = *(volatile uint64_t*)&in_args[1];
        out_args[0] = in_args[0];
 }
 
 void 
-munge_wll(const void *arg0 __unused, void *args)
+munge_wll(void *args)
 {
        volatile uint64_t *out_args = (volatile uint64_t*)args;
        volatile uint32_t *in_args = (volatile uint32_t*)args;
 
-       out_args[2] = *(uint64_t*)&in_args[3];
-       out_args[1] = *(uint64_t*)&in_args[1];
+       out_args[2] = *(volatile uint64_t*)&in_args[3];
+       out_args[1] = *(volatile uint64_t*)&in_args[1];
        out_args[0] = in_args[0];
 }
 
 void 
-munge_wlll(const void *arg0 __unused, void *args)
+munge_wlll(void *args)
 {
        volatile uint64_t *out_args = (volatile uint64_t*)args;
        volatile uint32_t *in_args = (volatile uint32_t*)args;
 
-       out_args[3] = *(uint64_t*)&in_args[5];
-       out_args[2] = *(uint64_t*)&in_args[3];
-       out_args[1] = *(uint64_t*)&in_args[1];
+       out_args[3] = *(volatile uint64_t*)&in_args[5];
+       out_args[2] = *(volatile uint64_t*)&in_args[3];
+       out_args[1] = *(volatile uint64_t*)&in_args[1];
+       out_args[0] = in_args[0];
+}
+
+void 
+munge_wllll(void *args)
+{
+       volatile uint64_t *out_args = (volatile uint64_t*)args;
+       volatile uint32_t *in_args = (volatile uint32_t*)args;
+
+       out_args[4] = *(volatile uint64_t*)&in_args[7];
+       out_args[3] = *(volatile uint64_t*)&in_args[5];
+       out_args[2] = *(volatile uint64_t*)&in_args[3];
+       out_args[1] = *(volatile uint64_t*)&in_args[1];
        out_args[0] = in_args[0];
 }
 
 void
-munge_wllww(const void *arg0 __unused, void *args)
+munge_wllww(void *args)
 {
        volatile uint64_t *out_args = (volatile uint64_t*)args;
        volatile uint32_t *in_args = (volatile uint32_t*)args;
 
        out_args[4] = in_args[6];
        out_args[3] = in_args[5];
-       out_args[2] = *(uint64_t*)&in_args[3];
-       out_args[1] = *(uint64_t*)&in_args[1];
+       out_args[2] = *(volatile uint64_t*)&in_args[3];
+       out_args[1] = *(volatile uint64_t*)&in_args[1];
        out_args[0] = in_args[0];
 }
 
 void 
-munge_wllwwll(const void *arg0 __unused, void *args)
+munge_wllwwll(void *args)
 {
        volatile uint64_t *out_args = (volatile uint64_t*)args;
        volatile uint32_t *in_args = (volatile uint32_t*)args;
 
-       out_args[6] = *(uint64_t*)&in_args[9];
-       out_args[5] = *(uint64_t*)&in_args[7];
+       out_args[6] = *(volatile uint64_t*)&in_args[9];
+       out_args[5] = *(volatile uint64_t*)&in_args[7];
        out_args[4] = in_args[6];
        out_args[3] = in_args[5];
-       out_args[2] = *(uint64_t*)&in_args[3];
-       out_args[1] = *(uint64_t*)&in_args[1];
+       out_args[2] = *(volatile uint64_t*)&in_args[3];
+       out_args[1] = *(volatile uint64_t*)&in_args[1];
        out_args[0] = in_args[0];
 }
 
 void 
-munge_wwwlw(const void *arg0 __unused, void *args)
+munge_wwwlw(void *args)
 {
        volatile uint64_t *out_args = (volatile uint64_t*)args;
        volatile uint32_t *in_args = (volatile uint32_t*)args;
 
        out_args[4] = in_args[5];
-       out_args[3] = *(uint64_t*)&in_args[3];
+       out_args[3] = *(volatile uint64_t*)&in_args[3];
        out_args[2] = in_args[2];
        out_args[1] = in_args[1];
        out_args[0] = in_args[0];
 }
 
 void 
-munge_wwwlww(const void *arg0 __unused, void *args)
+munge_wwwlww(void *args)
 {
        volatile uint64_t *out_args = (volatile uint64_t*)args;
        volatile uint32_t *in_args = (volatile uint32_t*)args;
 
        out_args[5] = in_args[6];
        out_args[4] = in_args[5];
-       out_args[3] = *(uint64_t*)&in_args[3];
+       out_args[3] = *(volatile uint64_t*)&in_args[3];
        out_args[2] = in_args[2];
        out_args[1] = in_args[1];
        out_args[0] = in_args[0];
 }
        
 void 
-munge_wwwl(const void *arg0 __unused, void *args)
+munge_wwwl(void *args)
 {
        volatile uint64_t *out_args = (volatile uint64_t*)args;
        volatile uint32_t *in_args = (volatile uint32_t*)args;
 
-       out_args[3] = *(uint64_t*)&in_args[3];
+       out_args[3] = *(volatile uint64_t*)&in_args[3];
        out_args[2] = in_args[2];
        out_args[1] = in_args[1];
        out_args[0] = in_args[0];
 }
 
 void 
-munge_wwwwlw(const void *arg0 __unused, void *args)
+munge_wwwwlw(void *args)
 {
        volatile uint64_t *out_args = (volatile uint64_t*)args;
        volatile uint32_t *in_args = (volatile uint32_t*)args;
 
        out_args[5] = in_args[6];
-       out_args[4] = *(uint64_t*)&in_args[4];
+       out_args[4] = *(volatile uint64_t*)&in_args[4];
        out_args[3] = in_args[3];
        out_args[2] = in_args[2];
        out_args[1] = in_args[1];
@@ -301,12 +327,12 @@ munge_wwwwlw(const void *arg0 __unused, void *args)
 }
 
 void 
-munge_wwwwl(const void *arg0 __unused, void *args)
+munge_wwwwl(void *args)
 {
        volatile uint64_t *out_args = (volatile uint64_t*)args;
        volatile uint32_t *in_args = (volatile uint32_t*)args;
 
-       out_args[4] = *(uint64_t*)&in_args[4];
+       out_args[4] = *(volatile uint64_t*)&in_args[4];
        out_args[3] = in_args[3];
        out_args[2] = in_args[2];
        out_args[1] = in_args[1];
@@ -314,12 +340,12 @@ munge_wwwwl(const void *arg0 __unused, void *args)
 }
 
 void 
-munge_wwwwwl(const void *arg0 __unused, void *args)
+munge_wwwwwl(void *args)
 {
        volatile uint64_t *out_args = (volatile uint64_t*)args;
        volatile uint32_t *in_args = (volatile uint32_t*)args;
 
-       out_args[5] = *(uint64_t*)&in_args[5];
+       out_args[5] = *(volatile uint64_t*)&in_args[5];
        out_args[4] = in_args[4];
        out_args[3] = in_args[3];
        out_args[2] = in_args[2];
@@ -328,14 +354,14 @@ munge_wwwwwl(const void *arg0 __unused, void *args)
 }
 
 void 
-munge_wwwwwlww(const void *arg0 __unused, void *args)
+munge_wwwwwlww(void *args)
 {
        volatile uint64_t *out_args = (volatile uint64_t*)args;
        volatile uint32_t *in_args = (volatile uint32_t*)args;
 
        out_args[7] = in_args[8];
        out_args[6] = in_args[7];
-       out_args[5] = *(uint64_t*)&in_args[5];
+       out_args[5] = *(volatile uint64_t*)&in_args[5];
        out_args[4] = in_args[4];
        out_args[3] = in_args[3];
        out_args[2] = in_args[2];
@@ -344,14 +370,14 @@ munge_wwwwwlww(const void *arg0 __unused, void *args)
 }
 
 void 
-munge_wwwwwllw(const void *arg0 __unused, void *args)
+munge_wwwwwllw(void *args)
 {
        volatile uint64_t *out_args = (volatile uint64_t*)args;
        volatile uint32_t *in_args = (volatile uint32_t*)args;
 
        out_args[7] = in_args[9];
-       out_args[6] = *(uint64_t*)&in_args[7];
-       out_args[5] = *(uint64_t*)&in_args[5];
+       out_args[6] = *(volatile uint64_t*)&in_args[7];
+       out_args[5] = *(volatile uint64_t*)&in_args[5];
        out_args[4] = in_args[4];
        out_args[3] = in_args[3];
        out_args[2] = in_args[2];
@@ -360,14 +386,14 @@ munge_wwwwwllw(const void *arg0 __unused, void *args)
 }
 
 void 
-munge_wwwwwlll(const void *arg0 __unused, void *args)
+munge_wwwwwlll(void *args)
 {
        volatile uint64_t *out_args = (volatile uint64_t*)args;
        volatile uint32_t *in_args = (volatile uint32_t*)args;
 
-       out_args[7] = *(uint64_t*)&in_args[9];
-       out_args[6] = *(uint64_t*)&in_args[7];
-       out_args[5] = *(uint64_t*)&in_args[5];
+       out_args[7] = *(volatile uint64_t*)&in_args[9];
+       out_args[6] = *(volatile uint64_t*)&in_args[7];
+       out_args[5] = *(volatile uint64_t*)&in_args[5];
        out_args[4] = in_args[4];
        out_args[3] = in_args[3];
        out_args[2] = in_args[2];
@@ -376,12 +402,12 @@ munge_wwwwwlll(const void *arg0 __unused, void *args)
 }
 
 void 
-munge_wwwwwwl(const void *arg0 __unused, void *args)
+munge_wwwwwwl(void *args)
 {
        volatile uint64_t *out_args = (volatile uint64_t*)args;
        volatile uint32_t *in_args = (volatile uint32_t*)args;
 
-       out_args[6] = *(uint64_t*)&in_args[6];
+       out_args[6] = *(volatile uint64_t*)&in_args[6];
        out_args[5] = in_args[5];
        out_args[4] = in_args[4];
        out_args[3] = in_args[3];
@@ -391,13 +417,13 @@ munge_wwwwwwl(const void *arg0 __unused, void *args)
 }
        
 void 
-munge_wwwwwwlw(const void *arg0 __unused, void *args)
+munge_wwwwwwlw(void *args)
 {
        volatile uint64_t *out_args = (volatile uint64_t*)args;
        volatile uint32_t *in_args = (volatile uint32_t*)args;
 
        out_args[7] = in_args[8];
-       out_args[6] = *(uint64_t*)&in_args[6];
+       out_args[6] = *(volatile uint64_t*)&in_args[6];
        out_args[5] = in_args[5];
        out_args[4] = in_args[4];
        out_args[3] = in_args[3];
@@ -407,13 +433,13 @@ munge_wwwwwwlw(const void *arg0 __unused, void *args)
 }
        
 void 
-munge_wwwwwwll(const void *arg0 __unused, void *args)
+munge_wwwwwwll(void *args)
 {
        volatile uint64_t *out_args = (volatile uint64_t*)args;
        volatile uint32_t *in_args = (volatile uint32_t*)args;
 
-       out_args[7] = *(uint64_t*)&in_args[8];
-       out_args[6] = *(uint64_t*)&in_args[6];
+       out_args[7] = *(volatile uint64_t*)&in_args[8];
+       out_args[6] = *(volatile uint64_t*)&in_args[6];
        out_args[5] = in_args[5];
        out_args[4] = in_args[4];
        out_args[3] = in_args[3];
@@ -423,7 +449,7 @@ munge_wwwwwwll(const void *arg0 __unused, void *args)
 }
 
 void 
-munge_wsw(const void *arg0 __unused, void *args)
+munge_wsw(void *args)
 {
        volatile uint64_t *out_args = (volatile uint64_t*)args;
        volatile uint32_t *in_args = (volatile uint32_t*)args;
@@ -434,7 +460,7 @@ munge_wsw(const void *arg0 __unused, void *args)
 }
 
 void 
-munge_wws(const void *arg0 __unused, void *args)
+munge_wws(void *args)
 {
        volatile uint64_t *out_args = (volatile uint64_t*)args;
        volatile uint32_t *in_args = (volatile uint32_t*)args;
@@ -445,7 +471,20 @@ munge_wws(const void *arg0 __unused, void *args)
 }
 
 void 
-munge_wwwsw(const void *arg0 __unused, void *args)
+munge_wwws(void *args)
+{
+       volatile uint64_t *out_args = (volatile uint64_t*)args;
+       volatile uint32_t *in_args = (volatile uint32_t*)args;
+
+       out_args[3] = (int64_t)(int)in_args[3]; /* Sign-extend */
+       out_args[2] = in_args[2];
+       out_args[1] = in_args[1];
+       out_args[0] = in_args[0];
+}
+
+
+void
+munge_wwwsw(void *args)
 {
        volatile uint64_t *out_args = (volatile uint64_t*)args;
        volatile uint32_t *in_args = (volatile uint32_t*)args;
@@ -458,35 +497,35 @@ munge_wwwsw(const void *arg0 __unused, void *args)
 }
 
 void 
-munge_llllll(const void *arg0 __unused, void *args __unused)
+munge_llllll(void *args __unused)
 {
        /* Nothing to do, already all 64-bit */
 }
 
 void 
-munge_ll(const void *arg0 __unused, void *args __unused)
+munge_ll(void *args __unused)
 {
        /* Nothing to do, already all 64-bit */
 }
 
 void 
-munge_l(const void *arg0 __unused, void *args __unused)
+munge_l(void *args __unused)
 {
        /* Nothing to do, already all 64-bit */
 }
 
 void 
-munge_lw(const void *arg0 __unused, void *args)
+munge_lw(void *args)
 {
        volatile uint64_t *out_args = (volatile uint64_t*)args;
        volatile uint32_t *in_args = (volatile uint32_t*)args;
 
        out_args[1] = in_args[2];
-       out_args[0] = *(uint64_t*)&in_args[0];
+       out_args[0] = *(volatile uint64_t*)&in_args[0];
 }
 
 void 
-munge_lwww(const void *arg0 __unused, void *args)
+munge_lwww(void *args)
 {
        volatile uint64_t *out_args = (volatile uint64_t*)args;
        volatile uint32_t *in_args = (volatile uint32_t*)args;
@@ -494,11 +533,40 @@ munge_lwww(const void *arg0 __unused, void *args)
        out_args[3] = in_args[4]; 
        out_args[2] = in_args[3];
        out_args[1] = in_args[2];
-       out_args[0] = *(uint64_t*)&in_args[0];
+       out_args[0] = *(volatile uint64_t*)&in_args[0];
+}
+
+void 
+munge_lwwwwwww(void *args)
+{
+       volatile uint64_t *out_args = (volatile uint64_t*)args;
+       volatile uint32_t *in_args = (volatile uint32_t*)args;
+
+       out_args[7] = in_args[8];
+       out_args[6] = in_args[7]; 
+       out_args[5] = in_args[6];
+       out_args[4] = in_args[5];
+       out_args[3] = in_args[4]; 
+       out_args[2] = in_args[3];
+       out_args[1] = in_args[2];
+       out_args[0] = *(volatile uint64_t*)&in_args[0];
 }
 
 void
-munge_wwlwww(const void *arg0 __unused, void *args)
+munge_wwlww(void *args)
+{
+       volatile uint64_t *out_args = (volatile uint64_t*)args;
+       volatile uint32_t *in_args = (volatile uint32_t*)args;
+
+       out_args[4] = in_args[5];
+       out_args[3] = in_args[4];
+       out_args[2] = *(volatile uint64_t*)&in_args[2];
+       out_args[1] = in_args[1];
+       out_args[0] = in_args[0];
+}
+
+void
+munge_wwlwww(void *args)
 {
        volatile uint64_t *out_args = (volatile uint64_t*)args;
        volatile uint32_t *in_args = (volatile uint32_t*)args;
@@ -506,7 +574,36 @@ munge_wwlwww(const void *arg0 __unused, void *args)
        out_args[5] = in_args[6];
        out_args[4] = in_args[5];
        out_args[3] = in_args[4];
-       out_args[2] = *(uint64_t*)&in_args[2];
+       out_args[2] = *(volatile uint64_t*)&in_args[2];
+       out_args[1] = in_args[1];
+       out_args[0] = in_args[0];
+}
+
+void
+munge_wlwwwl(void *args)
+{
+       volatile uint64_t *out_args = (volatile uint64_t*)args;
+       volatile uint32_t *in_args = (volatile uint32_t*)args;
+
+       out_args[5] = *(volatile uint64_t*)&in_args[6];
+       out_args[4] = in_args[5];
+       out_args[3] = in_args[4];
+       out_args[2] = in_args[3];
+       out_args[1] = *(volatile uint64_t*)&in_args[1];
+       out_args[0] = in_args[0];
+}
+
+void
+munge_wwlwwwl(void *args)
+{
+       volatile uint64_t *out_args = (volatile uint64_t*)args;
+       volatile uint32_t *in_args = (volatile uint32_t*)args;
+
+       out_args[6] = *(volatile uint64_t*)&in_args[7];
+       out_args[5] = in_args[6];
+       out_args[4] = in_args[5];
+       out_args[3] = in_args[4];
+       out_args[2] = *(volatile uint64_t*)&in_args[2];
        out_args[1] = in_args[1];
        out_args[0] = in_args[0];
 }
@@ -525,4 +622,3 @@ munge_32_to_64_unsigned(volatile uint64_t *dest, volatile uint32_t *src, int cou
                dest[i] = src[i];
        }   
 }
-