diff options
Diffstat (limited to 'include/exec')
| -rw-r--r-- | include/exec/cpu-all.h | 5 | ||||
| -rw-r--r-- | include/exec/hwaddr.h | 1 | ||||
| -rw-r--r-- | include/exec/user/thunk.h | 15 |
3 files changed, 6 insertions, 15 deletions
diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 3911576431..9f38edf419 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -34,14 +34,9 @@ /* some important defines: * - * WORDS_ALIGNED : if defined, the host cpu can only make word aligned - * memory accesses. - * * HOST_WORDS_BIGENDIAN : if defined, the host cpu is big endian and * otherwise little endian. * - * (TARGET_WORDS_ALIGNED : same for target cpu (not supported yet)) - * * TARGET_WORDS_BIGENDIAN : same for target cpu */ diff --git a/include/exec/hwaddr.h b/include/exec/hwaddr.h index bb41588b9d..a71c93cc81 100644 --- a/include/exec/hwaddr.h +++ b/include/exec/hwaddr.h @@ -3,7 +3,6 @@ #ifndef HWADDR_H #define HWADDR_H -#include <inttypes.h> #define HWADDR_BITS 64 /* hwaddr is the type of a physical address (its size can diff --git a/include/exec/user/thunk.h b/include/exec/user/thunk.h index ad1d60266e..f19ef4b230 100644 --- a/include/exec/user/thunk.h +++ b/include/exec/user/thunk.h @@ -60,10 +60,10 @@ typedef struct { /* Translation table for bitmasks... */ typedef struct bitmask_transtbl { - unsigned int x86_mask; - unsigned int x86_bits; - unsigned int alpha_mask; - unsigned int alpha_bits; + unsigned int target_mask; + unsigned int target_bits; + unsigned int host_mask; + unsigned int host_bits; } bitmask_transtbl; void thunk_register_struct(int id, const char *name, const argtype *types); @@ -71,7 +71,6 @@ void thunk_register_struct_direct(int id, const char *name, const StructEntry *se1); const argtype *thunk_convert(void *dst, const void *src, const argtype *type_ptr, int to_host); -#ifndef NO_THUNK_TYPE_SIZE extern StructEntry *struct_entries; @@ -178,11 +177,9 @@ static inline int thunk_type_align(const argtype *type_ptr, int is_host) } } -#endif /* NO_THUNK_TYPE_SIZE */ - -unsigned int target_to_host_bitmask(unsigned int x86_mask, +unsigned int target_to_host_bitmask(unsigned int target_mask, const bitmask_transtbl * trans_tbl); -unsigned int host_to_target_bitmask(unsigned int alpha_mask, +unsigned int host_to_target_bitmask(unsigned int host_mask, const bitmask_transtbl * trans_tbl); void thunk_init(unsigned int max_structs); |