[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 36/52] thunk: Rename args and fields in host-target b
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 36/52] thunk: Rename args and fields in host-target bitmask conversion code |
Date: |
Sun, 5 Jun 2016 10:43:13 +0300 |
From: Peter Maydell <address@hidden>
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 <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
include/exec/user/thunk.h | 12 ++++++------
thunk.c | 30 +++++++++++++++---------------
2 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/include/exec/user/thunk.h b/include/exec/user/thunk.h
index 57eb358..f19ef4b 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);
@@ -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);
diff --git a/thunk.c b/thunk.c
index 8aee299..2dac366 100644
--- a/thunk.c
+++ b/thunk.c
@@ -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)
--
2.1.4
- [Qemu-devel] [PULL 19/52] monitor: Typo fix, (continued)
- [Qemu-devel] [PULL 19/52] monitor: Typo fix, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 14/52] Fix linking relocatable objects on Sparc, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 25/52] Fix configure test for PBKDF2 in nettle, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 20/52] qdev: Clean up around properties, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 31/52] all: Remove unnecessary glib.h includes, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 07/52] po/Makefile: call rm -f directly, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 50/52] pc-bios/s390-ccw: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 42/52] crypto: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 36/52] thunk: Rename args and fields in host-target bitmask conversion code,
Michael Tokarev <=
- [Qemu-devel] [PULL 24/52] docs: Fix a couple of typos in throttle.txt, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 29/52] tests: Remove unnecessary glib.h includes, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 52/52] hbitmap: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 13/52] ppc: Remove a potential overflow in muldiv64(), Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 43/52] xen: Use DIV_ROUND_UP, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 30/52] qga: Remove unnecessary glib.h includes, Michael Tokarev, 2016/06/05
- [Qemu-devel] [PULL 35/52] thunk: Drop unused NO_THUNK_TYPE_SIZE guards, Michael Tokarev, 2016/06/05