mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

thunk: Rename args and fields in host-target bitmask conversion code

Browse Source 
The target_to_host_bitmask() and host_to_target_bitmask() functions
and the associated struct bitmask_transtbl are completely generic,
but for historical reasons the target related fields and parameters
are named 'x86' and the host related fields are named 'alpha'.
Rename them to 'target' and 'host'.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
Peter Maydell 2016-06-02 17:10:20 +01:00 committed by Michael Tokarev
parent 7a00217d1a
commit e0ca2ed562
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/exec/user/thunk.h
View File

@ -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);
@ -177,9 +177,9 @@ static inline int thunk_type_align(const argtype *type_ptr, int is_host)
}
}
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);

30
thunk.c
View File

@ -273,34 +273,34 @@ const argtype *thunk_convert(void *dst, const void *src,
/* from em86 */
/* Utility function: Table-driven functions to translate bitmasks
* between X86 and Alpha formats...
* between host and target formats
*/
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)
{
const bitmask_transtbl *btp;
unsigned int alpha_mask = 0;
unsigned int host_mask = 0;
for(btp = trans_tbl; btp->x86_mask && btp->alpha_mask; btp++) {
if((x86_mask & btp->x86_mask) == btp->x86_bits) {
alpha_mask |= btp->alpha_bits;
}
for (btp = trans_tbl; btp->target_mask && btp->host_mask; btp++) {
if ((target_mask & btp->target_mask) == btp->target_bits) {
host_mask |= btp->host_bits;
}
}
return(alpha_mask);
return host_mask;
}
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)
{
const bitmask_transtbl *btp;
unsigned int x86_mask = 0;
unsigned int target_mask = 0;
for(btp = trans_tbl; btp->x86_mask && btp->alpha_mask; btp++) {
if((alpha_mask & btp->alpha_mask) == btp->alpha_bits) {
x86_mask |= btp->x86_bits;
}
for (btp = trans_tbl; btp->target_mask && btp->host_mask; btp++) {
if ((host_mask & btp->host_mask) == btp->host_bits) {
target_mask |= btp->target_bits;
}
}
return(x86_mask);
return target_mask;
}
int thunk_type_size_array(const argtype *type_ptr, int is_host)