2c2
< Copyright (c) 2003 Hewlett-Packard Development Company, L.P.
---
> Copyright (c) 2003-2006 Hewlett-Packard Development Company, L.P.
79d78
< text_base = 0;
81,82d79
< unwind_start = 0;
< unwind_end = 0;
87c84
< text_base = *uvec++;
---
> env->text_base = text_base = *uvec++;
99a97,99
> case UWX_KEY_GP:
> uwx_set_reg(env, UWX_REG_GP, *uvec++);
> break;
136a137,138
> #define SWIZZLE(x) (((uint64_t)((x) & 0xc0000000) << 31) | (x))
>
144a147
> int status;
165d167
< mid = 0;
168,169c170
< len = COPYIN_UINFO_4((char *)&code_start,
< (uintptr_t)(unwind_start+mid*3*WORDSZ));
---
> len = COPYIN_UINFO_4((char *)&code_start, unwind_start+mid*3*WORDSZ);
171c172
< (uintptr_t)(unwind_start+mid*3*WORDSZ+WORDSZ));
---
> unwind_start+mid*3*WORDSZ+WORDSZ);
189c190
< (uintptr_t)(unwind_start+mid*3*WORDSZ+2*WORDSZ));
---
> unwind_start+mid*3*WORDSZ+2*WORDSZ);
194,196c195,198
< uentry->code_start = text_base + code_start;
< uentry->code_end = text_base + code_end;
< uentry->unwind_info = text_base + unwind_info;
---
> uentry->ptr_size = WORDSZ;
> uentry->code_start = SWIZZLE(text_base + code_start);
> uentry->code_end = SWIZZLE(text_base + code_end);
> uentry->unwind_info = SWIZZLE(text_base + unwind_info);
205c207
< (*env->copyin)(UWX_COPYIN_UINFO, (dest), (src), \
---
> (*env->copyin)(UWX_COPYIN_UINFO, (dest), (src), \
207c209
< (*(uint64_t *)(dest) = *(uint64_t *)(src), DWORDSZ) )
---
> (*(uint64_t *)(intptr_t)(dest) = *(uint64_t *)(intptr_t)(src), DWORDSZ) )
216a219
> int status;
235d237
< mid = 0;
261a264
> uentry->ptr_size = DWORDSZ;