diff options
Diffstat (limited to 'utils/libmach/swap.c')
| -rw-r--r-- | utils/libmach/swap.c | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/utils/libmach/swap.c b/utils/libmach/swap.c index 3ca9cf27..63f76293 100644 --- a/utils/libmach/swap.c +++ b/utils/libmach/swap.c @@ -1,4 +1,6 @@ #include <lib9.h> +#include <bio.h> +#include "mach.h" /* * big-endian short @@ -15,8 +17,8 @@ beswab(ushort s) /* * big-endian long */ -long -beswal(long l) +ulong +beswal(ulong l) { uchar *p; @@ -27,16 +29,16 @@ beswal(long l) /* * big-endian vlong */ -vlong -beswav(vlong v) +uvlong +beswav(uvlong v) { uchar *p; p = (uchar*)&v; - return ((vlong)p[0]<<56) | ((vlong)p[1]<<48) | ((vlong)p[2]<<40) - | ((vlong)p[3]<<32) | ((vlong)p[4]<<24) - | ((vlong)p[5]<<16) | ((vlong)p[6]<<8) - | (vlong)p[7]; + return ((uvlong)p[0]<<56) | ((uvlong)p[1]<<48) | ((uvlong)p[2]<<40) + | ((uvlong)p[3]<<32) | ((uvlong)p[4]<<24) + | ((uvlong)p[5]<<16) | ((uvlong)p[6]<<8) + | (uvlong)p[7]; } /* @@ -54,8 +56,8 @@ leswab(ushort s) /* * little-endian long */ -long -leswal(long l) +ulong +leswal(ulong l) { uchar *p; @@ -66,14 +68,14 @@ leswal(long l) /* * little-endian vlong */ -vlong -leswav(vlong v) +uvlong +leswav(uvlong v) { uchar *p; p = (uchar*)&v; - return ((vlong)p[7]<<56) | ((vlong)p[6]<<48) | ((vlong)p[5]<<40) - | ((vlong)p[4]<<32) | ((vlong)p[3]<<24) - | ((vlong)p[2]<<16) | ((vlong)p[1]<<8) - | (vlong)p[0]; + return ((uvlong)p[7]<<56) | ((uvlong)p[6]<<48) | ((uvlong)p[5]<<40) + | ((uvlong)p[4]<<32) | ((uvlong)p[3]<<24) + | ((uvlong)p[2]<<16) | ((uvlong)p[1]<<8) + | (uvlong)p[0]; } |