Fix PowerPC TLB miss dump code.

[qemu.git] / thunk.c

diff --git a/thunk.c b/thunk.c
index f28a976cd759738848070c98f81b11f0f3380ab8..dbeb2b1fc1c256cebbff830a6d9723f62a524766 100644 (file)
--- a/thunk.c
+++ b/thunk.c
@@ -1,6 +1,6 @@
 /*
  *  Generic thunking code to convert data between host and target CPU
 /*
  *  Generic thunking code to convert data between host and target CPU

- * 
+ *

  *  Copyright (c) 2003 Fabrice Bellard
  *
  * This library is free software; you can redistribute it and/or
  *  Copyright (c) 2003 Fabrice Bellard
  *
  * This library is free software; you can redistribute it and/or


@@ -29,80 +29,7 @@
 #define MAX_STRUCTS 128
 
 /* XXX: make it dynamic */
 #define MAX_STRUCTS 128
 
 /* XXX: make it dynamic */

-static StructEntry struct_entries[MAX_STRUCTS];
-
-static inline int thunk_type_size(const argtype *type_ptr, int is_host)
-{
-    int type, size;
-    const StructEntry *se;
-
-    type = *type_ptr;
-    switch(type) {
-    case TYPE_CHAR:
-        return 1;
-    case TYPE_SHORT:
-        return 2;
-    case TYPE_INT:
-        return 4;
-    case TYPE_LONGLONG:
-    case TYPE_ULONGLONG:
-        return 8;
-    case TYPE_LONG:
-    case TYPE_ULONG:
-    case TYPE_PTRVOID:
-    case TYPE_PTR:
-        if (is_host) {
-            return HOST_LONG_SIZE;
-        } else {
-            return TARGET_LONG_SIZE;
-        }
-        break;
-    case TYPE_ARRAY:
-        size = type_ptr[1];
-        return size * thunk_type_size(type_ptr + 2, is_host);
-    case TYPE_STRUCT:
-        se = struct_entries + type_ptr[1];
-        return se->size[is_host];
-    default:
-        return -1;
-    }
-}
-
-static inline int thunk_type_align(const argtype *type_ptr, int is_host)
-{
-    int type;
-    const StructEntry *se;
-
-    type = *type_ptr;
-    switch(type) {
-    case TYPE_CHAR:
-        return 1;
-    case TYPE_SHORT:
-        return 2;
-    case TYPE_INT:
-        return 4;
-    case TYPE_LONGLONG:
-    case TYPE_ULONGLONG:
-        return 8;
-    case TYPE_LONG:
-    case TYPE_ULONG:
-    case TYPE_PTRVOID:
-    case TYPE_PTR:
-        if (is_host) {
-            return HOST_LONG_SIZE;
-        } else {
-            return TARGET_LONG_SIZE;
-        }
-        break;
-    case TYPE_ARRAY:
-        return thunk_type_align(type_ptr + 2, is_host);
-    case TYPE_STRUCT:
-        se = struct_entries + type_ptr[1];
-        return se->align[is_host];
-    default:
-        return -1;
-    }
-}
+StructEntry struct_entries[MAX_STRUCTS];

 
 static inline const argtype *thunk_type_next(const argtype *type_ptr)
 {
 
 static inline const argtype *thunk_type_next(const argtype *type_ptr)
 {


@@ -137,7 +64,7 @@ void thunk_register_struct(int id, const char *name, const argtype *types)
     int nb_fields, offset, max_align, align, size, i, j;
 
     se = struct_entries + id;
     int nb_fields, offset, max_align, align, size, i, j;
 
     se = struct_entries + id;

-    
+

     /* first we count the number of fields */
     type_ptr = types;
     nb_fields = 0;
     /* first we count the number of fields */
     type_ptr = types;
     nb_fields = 0;


@@ -149,7 +76,7 @@ void thunk_register_struct(int id, const char *name, const argtype *types)
     se->nb_fields = nb_fields;
     se->name = name;
 #ifdef DEBUG
     se->nb_fields = nb_fields;
     se->name = name;
 #ifdef DEBUG

-    printf("struct %s: id=%d nb_fields=%d\n", 
+    printf("struct %s: id=%d nb_fields=%d\n",

            se->name, id, se->nb_fields);
 #endif
     /* now we can alloc the data */
            se->name, id, se->nb_fields);
 #endif
     /* now we can alloc the data */


@@ -167,12 +94,13 @@ void thunk_register_struct(int id, const char *name, const argtype *types)
             offset += size;
             if (align > max_align)
                 max_align = align;
             offset += size;
             if (align > max_align)
                 max_align = align;

+            type_ptr = thunk_type_next(type_ptr);

         }
         offset = (offset + max_align - 1) & ~(max_align - 1);
         se->size[i] = offset;
         se->align[i] = max_align;
 #ifdef DEBUG
         }
         offset = (offset + max_align - 1) & ~(max_align - 1);
         se->size[i] = offset;
         se->align[i] = max_align;
 #ifdef DEBUG

-        printf("%s: size=%d align=%d\n", 
+        printf("%s: size=%d align=%d\n",

                i == THUNK_HOST ? "host" : "target", offset, max_align);
 #endif
     }
                i == THUNK_HOST ? "host" : "target", offset, max_align);
 #endif
     }


@@ -188,7 +116,7 @@ void thunk_register_struct_direct(int id, const char *name, StructEntry *se1)
 
 
 /* now we can define the main conversion functions */
 
 
 /* now we can define the main conversion functions */

-const argtype *thunk_convert(void *dst, const void *src, 
+const argtype *thunk_convert(void *dst, const void *src,

                              const argtype *type_ptr, int to_host)
 {
     int type;
                              const argtype *type_ptr, int to_host)
 {
     int type;


@@ -225,7 +153,7 @@ const argtype *thunk_convert(void *dst, const void *src,
         }
         break;
 #else
         }
         break;
 #else

-#error unsupported conversion
+#warning unsupported conversion

 #endif
     case TYPE_ARRAY:
         {
 #endif
     case TYPE_ARRAY:
         {


@@ -254,7 +182,7 @@ const argtype *thunk_convert(void *dst, const void *src,
             uint8_t  *d;
             const argtype *field_types;
             const int *dst_offsets, *src_offsets;
             uint8_t  *d;
             const argtype *field_types;
             const int *dst_offsets, *src_offsets;

-            
+

             se = struct_entries + *type_ptr++;
             if (se->convert[0] != NULL) {
                 /* specific conversion is needed */
             se = struct_entries + *type_ptr++;
             if (se->convert[0] != NULL) {
                 /* specific conversion is needed */


@@ -267,8 +195,8 @@ const argtype *thunk_convert(void *dst, const void *src,
                 d = dst;
                 s = src;
                 for(i = 0;i < se->nb_fields; i++) {
                 d = dst;
                 s = src;
                 for(i = 0;i < se->nb_fields; i++) {

-                    field_types = thunk_convert(d + dst_offsets[i], 
-                                                s + src_offsets[i], 
+                    field_types = thunk_convert(d + dst_offsets[i],
+                                                s + src_offsets[i],

                                                 field_types, to_host);
                 }
             }
                                                 field_types, to_host);
                 }
             }


@@ -286,7 +214,7 @@ const argtype *thunk_convert(void *dst, const void *src,
 /* Utility function: Table-driven functions to translate bitmasks
  * between X86 and Alpha formats...
  */
 /* Utility function: Table-driven functions to translate bitmasks
  * between X86 and Alpha formats...
  */

-unsigned int target_to_host_bitmask(unsigned int x86_mask, 
+unsigned int target_to_host_bitmask(unsigned int x86_mask,

                                     bitmask_transtbl * trans_tbl)
 {
     bitmask_transtbl * btp;
                                     bitmask_transtbl * trans_tbl)
 {
     bitmask_transtbl * btp;


@@ -300,7 +228,7 @@ unsigned int target_to_host_bitmask(unsigned int x86_mask,
     return(alpha_mask);
 }
 
     return(alpha_mask);
 }
 

-unsigned int host_to_target_bitmask(unsigned int alpha_mask, 
+unsigned int host_to_target_bitmask(unsigned int alpha_mask,

                                     bitmask_transtbl * trans_tbl)
 {
     bitmask_transtbl * btp;
                                     bitmask_transtbl * trans_tbl)
 {
     bitmask_transtbl * btp;


@@ -308,7 +236,7 @@ unsigned int host_to_target_bitmask(unsigned int alpha_mask,
 
     for(btp = trans_tbl; btp->x86_mask && btp->alpha_mask; btp++) {
        if((alpha_mask & btp->alpha_mask) == btp->alpha_bits) {
 
     for(btp = trans_tbl; btp->x86_mask && btp->alpha_mask; btp++) {
        if((alpha_mask & btp->alpha_mask) == btp->alpha_bits) {

-           x86_mask |= btp->x86_mask;
+           x86_mask |= btp->x86_bits;

        }
     }
     return(x86_mask);
        }
     }
     return(x86_mask);