jcs.org / qemu
qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio
fork atom

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

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>

authored by

Peter Maydell and committed by
Michael Tokarev e0ca2ed5 7a00217d

+21 -21
+6 -6
include/exec/user/thunk.h
··· 60 60 61 61 /* Translation table for bitmasks... */ 62 62 typedef struct bitmask_transtbl { 63 - unsigned int x86_mask; 64 - unsigned int x86_bits; 65 - unsigned int alpha_mask; 66 - unsigned int alpha_bits; 63 + unsigned int target_mask; 64 + unsigned int target_bits; 65 + unsigned int host_mask; 66 + unsigned int host_bits; 67 67 } bitmask_transtbl; 68 68 69 69 void thunk_register_struct(int id, const char *name, const argtype *types); ··· 177 177 } 178 178 } 179 179 180 - unsigned int target_to_host_bitmask(unsigned int x86_mask, 180 + unsigned int target_to_host_bitmask(unsigned int target_mask, 181 181 const bitmask_transtbl * trans_tbl); 182 - unsigned int host_to_target_bitmask(unsigned int alpha_mask, 182 + unsigned int host_to_target_bitmask(unsigned int host_mask, 183 183 const bitmask_transtbl * trans_tbl); 184 184 185 185 void thunk_init(unsigned int max_structs);
+15 -15
thunk.c
··· 273 273 /* from em86 */ 274 274 275 275 /* Utility function: Table-driven functions to translate bitmasks 276 - * between X86 and Alpha formats... 276 + * between host and target formats 277 277 */ 278 - unsigned int target_to_host_bitmask(unsigned int x86_mask, 278 + unsigned int target_to_host_bitmask(unsigned int target_mask, 279 279 const bitmask_transtbl * trans_tbl) 280 280 { 281 281 const bitmask_transtbl *btp; 282 - unsigned int alpha_mask = 0; 282 + unsigned int host_mask = 0; 283 283 284 - for(btp = trans_tbl; btp->x86_mask && btp->alpha_mask; btp++) { 285 - if((x86_mask & btp->x86_mask) == btp->x86_bits) { 286 - alpha_mask |= btp->alpha_bits; 287 - } 284 + for (btp = trans_tbl; btp->target_mask && btp->host_mask; btp++) { 285 + if ((target_mask & btp->target_mask) == btp->target_bits) { 286 + host_mask |= btp->host_bits; 287 + } 288 288 } 289 - return(alpha_mask); 289 + return host_mask; 290 290 } 291 291 292 - unsigned int host_to_target_bitmask(unsigned int alpha_mask, 292 + unsigned int host_to_target_bitmask(unsigned int host_mask, 293 293 const bitmask_transtbl * trans_tbl) 294 294 { 295 295 const bitmask_transtbl *btp; 296 - unsigned int x86_mask = 0; 296 + unsigned int target_mask = 0; 297 297 298 - for(btp = trans_tbl; btp->x86_mask && btp->alpha_mask; btp++) { 299 - if((alpha_mask & btp->alpha_mask) == btp->alpha_bits) { 300 - x86_mask |= btp->x86_bits; 301 - } 298 + for (btp = trans_tbl; btp->target_mask && btp->host_mask; btp++) { 299 + if ((host_mask & btp->host_mask) == btp->host_bits) { 300 + target_mask |= btp->target_bits; 301 + } 302 302 } 303 - return(x86_mask); 303 + return target_mask; 304 304 } 305 305 306 306 int thunk_type_size_array(const argtype *type_ptr, int is_host)