Fixed compilation erros in Mac OSX

Author: Karic

include/comm.h

@@ -17,6 +17,7 @@
 
 #define TRUE  1
 #define FALSE 0
+
 #define bool char
 
 typedef uint8_t  U1;

include/endianswap.h

@@ -6,57 +6,36 @@
  *
  * modifications:
  *	1. Rename to endianswap.h by kari.zhang @ 2016-01-13
+ *
+ *  2. Remove swap_16() and swap_32(), 
+ *     Because both *.class and networt protocol use Big-Endian,
+ *     So, use ntohs() ntohl() instead of swap_16() or swap_32() @ 2018-09-21
+ *
  *******************************************************/
 
 #ifndef __ENDIANSWAP__H__
 #define __ENDIANSWAP__H__
 
-#include <byteswap.h>
+#include <arpa/inet.h>
 #include <comm.h>
-#include <machineconf.h>
 
-#define READ_U1(u1, data) do {										\
-	u1 = *(data);							        			    \
-	(data) ++;                                                      \
+#define READ_U1(u1, data) do {	    									\
+        u1 = *(data);							        			    \
+        (data) ++;                                                      \
 } while (0);
 
-#ifdef SMALL_ENDIAN
- #define READ_U2(u2, data) do {										\
-    u2 = *((U2*)(data));                                            \
-    u2 = bswap_16(u2);                                              \
-    (data) += 2;                                                    \
- } while (0);
-#else 
- #define READ_U2(u2, data) do {										\
-    u2 = *((U2*)(data));                                            \
-    (data) += 2;                                                    \
- } while (0);
-#endif
+#define READ_U2(u2, data) do {	    									\
+        u2 = *((U2*)(data));                                            \
+        u2 = ntohs(u2);                                              \
+        (data) += 2;                                                    \
+} while (0);
 
-#ifdef SMALL_ENDIAN
- #define READ_U4(u4, data) do {										\
-    u4 = *((U4*)(data));                                            \
-    u4 = bswap_32(u4);                                              \
-	(data) += 4;                                                    \
- } while (0);
-#else 
- #define READ_U4(u4, data) do {										\
-    u4 = *((U4*)(data));                                            \
-	(data) += 4;                                                    \
- } while (0);
-#endif
+#define READ_U4(u4, data) do {	    									\
+        u4 = *((U4*)(data));                                            \
+        u4 = ntohl(u4);                                              \
+        (data) += 4;                                                    \
+} while (0);
 
-#ifdef SMALL_ENDIAN
- #define READ_INT32(u4, data) do {				    				\
-    u4 = *((int32*)(data));                                         \
-    u4 = bswap_32(u4);                                              \
-	(data) += 4;                                                    \
- } while (0);
-#else 
- #define READ_INT32(u4, data) do {				    				\
-    u4 = *((int32*)(data));                                         \
-	(data) += 4;                                                    \
- } while (0);
-#endif
+#define READ_INT32(x,y) READ_U4(x,y)
 
 #endif

include/machineconf.h

@@ -10,13 +10,11 @@
  *
  * modifications:
  *	1. Rename to machineconf.h by kari.zhang @ 2016-01-16
+ *  2. Never use SMALL_ENDIAN to distinguish CPU endianness,
+ *      use ntohs() or ntohl(), keep this file for memory @ 2018-09-21
  *******************************************************/
 
 #ifndef __MACHINECONF__H__
 #define __MACHINECONF__H__
 
-// default in small endian machine
-// If in big endian, please remove this macro define
-#define SMALL_ENDIAN
-
 #endif

src/vm/instruction.c

@@ -1,11 +1,18 @@
 /*************************************
- *file name:	instruction.c 
- *description:	define instruction set
- *
+ * file name:	instruction.c 
+ * description:	define instruction set
+ * mofications:
+ *  1. rename ldiv to lDiv to avoid compilation errors in Mac OSX
  ************************************/
 
 #include <assert.h>
+
+#ifdef linux
 #include <malloc.h>
+#else
+#include <stdlib.h>
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include "comm.h"
@@ -129,7 +136,7 @@ enum {
     fmul,			// 0x6a
     dmul,			// 0x6b
     idiv,			// 0x6c
-    ldiv,			// 0x6d
+    lDiv,			// 0x6d
     fdiv,			// 0x6e
     ddiv,			// 0x6f
     irem,			// 0x70
@@ -339,7 +346,7 @@ DECL_FUNC(lmul);
 DECL_FUNC(fmul);
 DECL_FUNC(dmul);
 DECL_FUNC(idiv);
-DECL_FUNC(ldiv);
+DECL_FUNC(lDiv);
 DECL_FUNC(fdiv);
 DECL_FUNC(ddiv);
 DECL_FUNC(irem);
@@ -576,7 +583,7 @@ static Instruction sInstructionTable[] = {
     INIT_INST(fmul, 0),			// 0x6a
     INIT_INST(dmul, 0),			// 0x6b
     INIT_INST(idiv, 0),			// 0x6c
-    INIT_INST(ldiv, 0),			// 0x6d
+    INIT_INST(lDiv, 0),			// 0x6d
     INIT_INST(fdiv, 0),			// 0x6e
     INIT_INST(ddiv, 0),			// 0x6f
     INIT_INST(irem,	0), 		// 0x70
@@ -2055,7 +2062,7 @@ DECL_FUNC(idiv)
     return FALSE;
 }
 
-DECL_FUNC(ldiv)
+DECL_FUNC(lDiv)
 {
 #ifdef LOG_DETAIL
     printf("\t*ldiv\n");