about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorserpilliere <devnull@localhost>2014-06-13 10:33:32 +0200
committerserpilliere <devnull@localhost>2014-06-13 10:33:32 +0200
commit07ffdcf9b8a0703944ed998a31f16f38f1c4a979 (patch)
treeb39cdc9ce786ac2dd8c2fbbc0353cd7ac1d3bbac
parentcb79ac1923f563aba100148e9daa220b5977e95a (diff)
downloadmiasm-07ffdcf9b8a0703944ed998a31f16f38f1c4a979.tar.gz
miasm-07ffdcf9b8a0703944ed998a31f16f38f1c4a979.zip
Jitter: Remove inline for clang compilation
-rw-r--r--miasm2/jitter/arch/JitCore_msp430.c12
-rw-r--r--miasm2/jitter/vm_mngr.c12
-rw-r--r--miasm2/jitter/vm_mngr.h2
3 files changed, 13 insertions, 13 deletions
diff --git a/miasm2/jitter/arch/JitCore_msp430.c b/miasm2/jitter/arch/JitCore_msp430.c
index 8d85735c..e5f7ffab 100644
--- a/miasm2/jitter/arch/JitCore_msp430.c
+++ b/miasm2/jitter/arch/JitCore_msp430.c
@@ -352,7 +352,7 @@ uint8_t const bin2bcd_data[] = {
 	0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99
 };
 
-inline uint16_t bcdadd_16(uint16_t a, uint16_t b)
+uint16_t bcdadd_16(uint16_t a, uint16_t b)
 {
 	int carry = 0;
 	int i,j = 0;
@@ -376,7 +376,7 @@ inline uint16_t bcdadd_16(uint16_t a, uint16_t b)
 	return res;
 }
 
-inline uint16_t bcdadd_cf_16(uint16_t a, uint16_t b)
+uint16_t bcdadd_cf_16(uint16_t a, uint16_t b)
 {
 	int carry = 0;
 	int i,j = 0;
@@ -399,22 +399,22 @@ inline uint16_t bcdadd_cf_16(uint16_t a, uint16_t b)
 }
 
 
-inline uint16_t hex2bcd_16(uint16_t a)
+uint16_t hex2bcd_16(uint16_t a)
 {
 	return bcd2bin_data[a & 0xFF] + (bcd2bin_data[(a >> 8) & 0xFF] * 100);
 }
 
-inline uint8_t hex2bcd_8(uint8_t a)
+uint8_t hex2bcd_8(uint8_t a)
 {
 	return bcd2bin_data[a & 0xFF];
 }
 
-inline uint8_t bcd2hex_8(uint8_t a)
+uint8_t bcd2hex_8(uint8_t a)
 {
 	return bin2bcd_data[a & 0xFF];
 }
 
-inline uint16_t bcd2hex_16(uint16_t a)
+uint16_t bcd2hex_16(uint16_t a)
 {
 	return bcd2bin_data[a % 100] | (bcd2bin_data[(a / 100)] << 8);
 }
diff --git a/miasm2/jitter/vm_mngr.c b/miasm2/jitter/vm_mngr.c
index 7d47fadc..1ee1882b 100644
--- a/miasm2/jitter/vm_mngr.c
+++ b/miasm2/jitter/vm_mngr.c
@@ -134,7 +134,7 @@ struct memory_page_node * get_memory_page_from_address(vm_mngr_t* vm_mngr, uint6
 
 
 
-static inline uint64_t memory_page_read(vm_mngr_t* vm_mngr, unsigned int my_size, uint64_t ad)
+static uint64_t memory_page_read(vm_mngr_t* vm_mngr, unsigned int my_size, uint64_t ad)
 {
 	struct memory_page_node * mpn;
 	unsigned char * addr;
@@ -223,7 +223,7 @@ static inline uint64_t memory_page_read(vm_mngr_t* vm_mngr, unsigned int my_size
 	return ret;
 }
 
-static inline void memory_page_write(vm_mngr_t* vm_mngr, unsigned int my_size,
+static void memory_page_write(vm_mngr_t* vm_mngr, unsigned int my_size,
 				     uint64_t ad, uint64_t src)
 {
 	struct memory_page_node * mpn;
@@ -313,7 +313,7 @@ static inline void memory_page_write(vm_mngr_t* vm_mngr, unsigned int my_size,
  * parity, ...
  */
 
-inline uint16_t bcdadd_16(uint16_t a, uint16_t b)
+uint16_t bcdadd_16(uint16_t a, uint16_t b)
 {
 	int carry = 0;
 	int i,j = 0;
@@ -337,7 +337,7 @@ inline uint16_t bcdadd_16(uint16_t a, uint16_t b)
 	return res;
 }
 
-inline uint16_t bcdadd_cf_16(uint16_t a, uint16_t b)
+uint16_t bcdadd_cf_16(uint16_t a, uint16_t b)
 {
 	int carry = 0;
 	int i,j = 0;
@@ -369,7 +369,7 @@ void dump_code_bloc(vm_mngr_t* vm_mngr)
 
 }
 
-inline void check_write_code_bloc(vm_mngr_t* vm_mngr, unsigned int my_size, uint64_t addr)
+void check_write_code_bloc(vm_mngr_t* vm_mngr, unsigned int my_size, uint64_t addr)
 {
 	struct code_bloc_node * cbp;
 	vm_mngr->last_write_ad = addr;
@@ -514,7 +514,7 @@ uint64_t MEM_LOOKUP_64(vm_mngr_t* vm_mngr, uint64_t addr)
     return ret;
 }
 
-inline unsigned int parity(unsigned int a)
+unsigned int parity(unsigned int a)
 {
 #if defined(__builtin_parity)
 	return __builtin_parity(a);
diff --git a/miasm2/jitter/vm_mngr.h b/miasm2/jitter/vm_mngr.h
index 1e032200..49610323 100644
--- a/miasm2/jitter/vm_mngr.h
+++ b/miasm2/jitter/vm_mngr.h
@@ -174,7 +174,7 @@ unsigned int MEM_LOOKUP_32_PASSTHROUGH(uint64_t addr);
 uint64_t MEM_LOOKUP_64_PASSTHROUGH(uint64_t addr);
 
 
-inline unsigned int parity(unsigned int a);
+unsigned int parity(unsigned int a);
 unsigned int my_imul08(unsigned int a, unsigned int b);
 
 void vm_throw(vm_mngr_t* vm_mngr, unsigned long flags);