FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2005-09-19 Paul Brook <paul@codesourcery.com>

Browse source 
* armdefs.h: Define ARMsword and ARMsdword. Use stdint.h when
	available.
	* armemu.c: Use them.
	* armvirt.c (ARMul_MemoryInit): Use correct type for size.
	* configure.ac: Check for stdint.h.
	* config.in: Regenerate.
	* configure: Regenerate.
This commit is contained in:
Paul Brook 2005-09-19 14:21:09 +00:00
parent 6a8492b562
commit c4793bacbf
7 changed files with 217 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sim/arm/ChangeLog
View file

@ -1,3 +1,13 @@
2005-09-19 Paul Brook <paul@codesourcery.com>
* armdefs.h: Define ARMsword and ARMsdword. Use stdint.h when
available.
* armemu.c: Use them.
* armvirt.c (ARMul_MemoryInit): Use correct type for size.
* configure.ac: Check for stdint.h.
* config.in: Regenerate.
* configure: Regenerate.
2005-05-24 Nick Clifton <nickc@redhat.com> 2005-05-24 Nick Clifton <nickc@redhat.com>
* thumbemu.c (handle_v6_thumb_insn): New function. * thumbemu.c (handle_v6_thumb_insn): New function.

13
sim/arm/armdefs.h
View file

@ -15,6 +15,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */
#include "config.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -29,8 +30,18 @@
typedef char *VoidStar; typedef char *VoidStar;
#endif #endif
typedef unsigned long ARMword; /* must be 32 bits wide */ #ifdef HAVE_STDINT_H
#include <stdint.h>
typedef uint32_t ARMword;
typedef int32_t ARMsword;
typedef uint64_t ARMdword;
typedef int64_t ARMsdword;
#else
typedef unsigned int ARMword; /* must be 32 bits wide */
typedef signed int ARMsword;
typedef unsigned long long ARMdword; /* Must be at least 64 bits wide. */ typedef unsigned long long ARMdword; /* Must be at least 64 bits wide. */
typedef signed long long ARMsdword;
#endif
typedef struct ARMul_State ARMul_State; typedef struct ARMul_State ARMul_State;
typedef unsigned ARMul_CPInits (ARMul_State * state); typedef unsigned ARMul_CPInits (ARMul_State * state);

52
sim/arm/armemu.c
View file

@ -1584,9 +1584,9 @@ check_PMUintr:
&& (BIT (5) == 0 || BITS (12, 15) == 0)) && (BIT (5) == 0 || BITS (12, 15) == 0))
{ {
/* ElSegundo SMLAWy/SMULWy insn. */ /* ElSegundo SMLAWy/SMULWy insn. */
unsigned long long op1 = state->Reg[BITS (0, 3)]; ARMdword op1 = state->Reg[BITS (0, 3)];
unsigned long long op2 = state->Reg[BITS (8, 11)]; ARMdword op2 = state->Reg[BITS (8, 11)];
unsigned long long result; ARMdword result;
if (BIT (6)) if (BIT (6))
op2 >>= 16; op2 >>= 16;
@ -1733,10 +1733,10 @@ check_PMUintr:
if (BIT (4) == 0 && BIT (7) == 1) if (BIT (4) == 0 && BIT (7) == 1)
{ {
/* ElSegundo SMLALxy insn. */ /* ElSegundo SMLALxy insn. */
unsigned long long op1 = state->Reg[BITS (0, 3)]; ARMdword op1 = state->Reg[BITS (0, 3)];
unsigned long long op2 = state->Reg[BITS (8, 11)]; ARMdword op2 = state->Reg[BITS (8, 11)];
unsigned long long dest; ARMdword dest;
unsigned long long result; ARMdword result;
if (BIT (5)) if (BIT (5))
op1 >>= 16; op1 >>= 16;
@ -1749,7 +1749,7 @@ check_PMUintr:
if (op2 & 0x8000) if (op2 & 0x8000)
op2 -= 65536; op2 -= 65536;
dest = (unsigned long long) state->Reg[BITS (16, 19)] << 32; dest = (ARMdword) state->Reg[BITS (16, 19)] << 32;
dest |= state->Reg[BITS (12, 15)]; dest |= state->Reg[BITS (12, 15)];
dest += op1 * op2; dest += op1 * op2;
state->Reg[BITS (12, 15)] = dest; state->Reg[BITS (12, 15)] = dest;
@ -3684,8 +3684,8 @@ check_PMUintr:
{ {
/* XScale MIA instruction. Signed multiplication of /* XScale MIA instruction. Signed multiplication of
two 32 bit values and addition to 40 bit accumulator. */ two 32 bit values and addition to 40 bit accumulator. */
long long Rm = state->Reg[MULLHSReg]; ARMsdword Rm = state->Reg[MULLHSReg];
long long Rs = state->Reg[MULACCReg]; ARMsdword Rs = state->Reg[MULACCReg];
if (Rm & (1 << 31)) if (Rm & (1 << 31))
Rm -= 1ULL << 32; Rm -= 1ULL << 32;
@ -3704,7 +3704,7 @@ check_PMUintr:
ARMword t2 = state->Reg[MULACCReg] >> 16; ARMword t2 = state->Reg[MULACCReg] >> 16;
ARMword t3 = state->Reg[MULLHSReg] & 0xffff; ARMword t3 = state->Reg[MULLHSReg] & 0xffff;
ARMword t4 = state->Reg[MULACCReg] & 0xffff; ARMword t4 = state->Reg[MULACCReg] & 0xffff;
long long t5; ARMsdword t5;
if (t1 & (1 << 15)) if (t1 & (1 << 15))
t1 -= 1 << 16; t1 -= 1 << 16;
@ -3734,7 +3734,7 @@ check_PMUintr:
/* XScale MIAxy instruction. */ /* XScale MIAxy instruction. */
ARMword t1; ARMword t1;
ARMword t2; ARMword t2;
long long t5; ARMsdword t5;
if (BIT (17)) if (BIT (17))
t1 = state->Reg[MULLHSReg] >> 16; t1 = state->Reg[MULLHSReg] >> 16;
@ -3926,9 +3926,9 @@ GetDPRegRHS (ARMul_State * state, ARMword instr)
if (shamt == 0) if (shamt == 0)
return (base); return (base);
else if (shamt >= 32) else if (shamt >= 32)
return ((ARMword) ((long int) base >> 31L)); return ((ARMword) ((ARMsword) base >> 31L));
else else
return ((ARMword) ((long int) base >> (int) shamt)); return ((ARMword) ((ARMsword) base >> (int) shamt));
case ROR: case ROR:
shamt &= 0x1f; shamt &= 0x1f;
if (shamt == 0) if (shamt == 0)
@ -3958,9 +3958,9 @@ GetDPRegRHS (ARMul_State * state, ARMword instr)
return (base >> shamt); return (base >> shamt);
case ASR: case ASR:
if (shamt == 0) if (shamt == 0)
return ((ARMword) ((long int) base >> 31L)); return ((ARMword) ((ARMsword) base >> 31L));
else else
return ((ARMword) ((long int) base >> (int) shamt)); return ((ARMword) ((ARMsword) base >> (int) shamt));
case ROR: case ROR:
if (shamt == 0) if (shamt == 0)
/* It's an RRX. */ /* It's an RRX. */
@ -4041,12 +4041,12 @@ GetDPSRegRHS (ARMul_State * state, ARMword instr)
else if (shamt >= 32) else if (shamt >= 32)
{ {
ASSIGNC (base >> 31L); ASSIGNC (base >> 31L);
return ((ARMword) ((long int) base >> 31L)); return ((ARMword) ((ARMsword) base >> 31L));
} }
else else
{ {
ASSIGNC ((ARMword) ((long int) base >> (int) (shamt - 1)) & 1); ASSIGNC ((ARMword) ((ARMsword) base >> (int) (shamt - 1)) & 1);
return ((ARMword) ((long int) base >> (int) shamt)); return ((ARMword) ((ARMsword) base >> (int) shamt));
} }
case ROR: case ROR:
if (shamt == 0) if (shamt == 0)
@ -4095,12 +4095,12 @@ GetDPSRegRHS (ARMul_State * state, ARMword instr)
if (shamt == 0) if (shamt == 0)
{ {
ASSIGNC (base >> 31L); ASSIGNC (base >> 31L);
return ((ARMword) ((long int) base >> 31L)); return ((ARMword) ((ARMsword) base >> 31L));
} }
else else
{ {
ASSIGNC ((ARMword) ((long int) base >> (int) (shamt - 1)) & 1); ASSIGNC ((ARMword) ((ARMsword) base >> (int) (shamt - 1)) & 1);
return ((ARMword) ((long int) base >> (int) shamt)); return ((ARMword) ((ARMsword) base >> (int) shamt));
} }
case ROR: case ROR:
if (shamt == 0) if (shamt == 0)
@ -4239,9 +4239,9 @@ GetLSRegRHS (ARMul_State * state, ARMword instr)
return (base >> shamt); return (base >> shamt);
case ASR: case ASR:
if (shamt == 0) if (shamt == 0)
return ((ARMword) ((long int) base >> 31L)); return ((ARMword) ((ARMsword) base >> 31L));
else else
return ((ARMword) ((long int) base >> (int) shamt)); return ((ARMword) ((ARMsword) base >> (int) shamt));
case ROR: case ROR:
if (shamt == 0) if (shamt == 0)
/* It's an RRX. */ /* It's an RRX. */
@ -5086,10 +5086,10 @@ Multiply64 (ARMul_State * state, ARMword instr, int msigned, int scc)
/* Compute sign of result and adjust operands if necessary. */ /* Compute sign of result and adjust operands if necessary. */
sign = (Rm ^ Rs) & 0x80000000; sign = (Rm ^ Rs) & 0x80000000;
if (((signed long) Rm) < 0) if (((ARMsword) Rm) < 0)
Rm = -Rm; Rm = -Rm;
if (((signed long) Rs) < 0) if (((ARMsword) Rs) < 0)
Rs = -Rs; Rs = -Rs;
} }

2
sim/arm/armvirt.c
View file

@ -139,7 +139,7 @@ ARMul_MemoryInit (ARMul_State * state, unsigned long initmemsize)
if (initmemsize) if (initmemsize)
state->MemSize = initmemsize; state->MemSize = initmemsize;
pagetable = (ARMword **) malloc (sizeof (ARMword) * NUMPAGES); pagetable = (ARMword **) malloc (sizeof (ARMword *) * NUMPAGES);
if (pagetable == NULL) if (pagetable == NULL)
return FALSE; return FALSE;

275
sim/arm/config.in
View file

@ -1,54 +1,11 @@
/* config.in. Generated automatically from configure.in by autoheader. */ /* config.in. Generated from configure.ac by autoheader. */
/* Define if using alloca.c. */
#undef C_ALLOCA
/* Define to empty if the keyword does not work. */
#undef const
/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
This function is required for alloca.c support on those systems. */
#undef CRAY_STACKSEG_END
/* Define if you have alloca, as a function or macro. */
#undef HAVE_ALLOCA
/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
#undef HAVE_ALLOCA_H
/* Define if you have a working `mmap' system call. */
#undef HAVE_MMAP
/* Define as __inline if that's what the C compiler calls it. */
#undef inline
/* Define to `long' if <sys/types.h> doesn't define. */
#undef off_t
/* Define if you need to in order for stat and other things to work. */
#undef _POSIX_SOURCE
/* Define as the return type of signal handlers (int or void). */
#undef RETSIGTYPE
/* Define to `unsigned' if <sys/types.h> doesn't define. */
#undef size_t
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
automatically deduced at run-time.
STACK_DIRECTION > 0 => grows toward higher addresses
STACK_DIRECTION < 0 => grows toward lower addresses
STACK_DIRECTION = 0 => direction of growth unknown
*/
#undef STACK_DIRECTION
/* Define if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Define to 1 if NLS is requested. */ /* Define to 1 if NLS is requested. */
#undef ENABLE_NLS #undef ENABLE_NLS
/* Define as 1 if you have catgets and don't want to use GNU gettext. */
#undef HAVE_CATGETS
/* Define as 1 if you have gettext and don't want to use GNU gettext. */ /* Define as 1 if you have gettext and don't want to use GNU gettext. */
#undef HAVE_GETTEXT #undef HAVE_GETTEXT
@ -58,101 +15,199 @@
/* Define if your locale.h file contains LC_MESSAGES. */ /* Define if your locale.h file contains LC_MESSAGES. */
#undef HAVE_LC_MESSAGES #undef HAVE_LC_MESSAGES
/* Define if you have the __argz_count function. */ /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
#undef HAVE___ARGZ_COUNT systems. This function is required for `alloca.c' support on those systems.
*/
#undef CRAY_STACKSEG_END
/* Define if you have the __argz_next function. */ /* Define to 1 if using `alloca.c'. */
#undef HAVE___ARGZ_NEXT #undef C_ALLOCA
/* Define if you have the __argz_stringify function. */ /* Define to 1 if NLS is requested */
#undef HAVE___ARGZ_STRINGIFY #undef ENABLE_NLS
/* Define if you have the __setfpucw function. */ /* Define to 1 if you have `alloca', as a function or macro. */
#undef HAVE___SETFPUCW #undef HAVE_ALLOCA
/* Define if you have the dcgettext function. */ /* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
#undef HAVE_DCGETTEXT */
#undef HAVE_ALLOCA_H
/* Define if you have the getcwd function. */ /* Define to 1 if you have the <argz.h> header file. */
#undef HAVE_GETCWD
/* Define if you have the getpagesize function. */
#undef HAVE_GETPAGESIZE
/* Define if you have the getrusage function. */
#undef HAVE_GETRUSAGE
/* Define if you have the munmap function. */
#undef HAVE_MUNMAP
/* Define if you have the putenv function. */
#undef HAVE_PUTENV
/* Define if you have the setenv function. */
#undef HAVE_SETENV
/* Define if you have the setlocale function. */
#undef HAVE_SETLOCALE
/* Define if you have the sigaction function. */
#undef HAVE_SIGACTION
/* Define if you have the stpcpy function. */
#undef HAVE_STPCPY
/* Define if you have the strcasecmp function. */
#undef HAVE_STRCASECMP
/* Define if you have the strchr function. */
#undef HAVE_STRCHR
/* Define if you have the time function. */
#undef HAVE_TIME
/* Define if you have the <argz.h> header file. */
#undef HAVE_ARGZ_H #undef HAVE_ARGZ_H
/* Define if you have the <fcntl.h> header file. */ /* Define to 1 if you have the `dcgettext' function. */
#undef HAVE_DCGETTEXT
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
/* Define to 1 if you have the <errno.h> header file. */
#undef HAVE_ERRNO_H
/* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H #undef HAVE_FCNTL_H
/* Define if you have the <fpu_control.h> header file. */ /* Define to 1 if you have the <fpu_control.h> header file. */
#undef HAVE_FPU_CONTROL_H #undef HAVE_FPU_CONTROL_H
/* Define if you have the <limits.h> header file. */ /* Define to 1 if you have the `getcwd' function. */
#undef HAVE_GETCWD
/* Define to 1 if you have the `getpagesize' function. */
#undef HAVE_GETPAGESIZE
/* Define to 1 if you have the `getrusage' function. */
#undef HAVE_GETRUSAGE
/* Define as 1 if you have gettext and don't want to use GNU gettext. */
#undef HAVE_GETTEXT
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define if your locale.h file contains LC_MESSAGES. */
#undef HAVE_LC_MESSAGES
/* Define to 1 if you have the `nsl' library (-lnsl). */
#undef HAVE_LIBNSL
/* Define to 1 if you have the `socket' library (-lsocket). */
#undef HAVE_LIBSOCKET
/* Define to 1 if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H #undef HAVE_LIMITS_H
/* Define if you have the <locale.h> header file. */ /* Define to 1 if you have the <locale.h> header file. */
#undef HAVE_LOCALE_H #undef HAVE_LOCALE_H
/* Define if you have the <malloc.h> header file. */ /* Define to 1 if you have the <malloc.h> header file. */
#undef HAVE_MALLOC_H #undef HAVE_MALLOC_H
/* Define if you have the <nl_types.h> header file. */ /* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
/* Define to 1 if you have a working `mmap' system call. */
#undef HAVE_MMAP
/* Define to 1 if you have the `munmap' function. */
#undef HAVE_MUNMAP
/* Define to 1 if you have the <nl_types.h> header file. */
#undef HAVE_NL_TYPES_H #undef HAVE_NL_TYPES_H
/* Define if you have the <stdlib.h> header file. */ /* Define to 1 if you have the `putenv' function. */
#undef HAVE_PUTENV
/* Define to 1 if you have the `setenv' function. */
#undef HAVE_SETENV
/* Define to 1 if you have the `setlocale' function. */
#undef HAVE_SETLOCALE
/* Define to 1 if you have the `sigaction' function. */
#undef HAVE_SIGACTION
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H #undef HAVE_STDLIB_H
/* Define if you have the <string.h> header file. */ /* Define if you have the stpcpy function */
#undef HAVE_STRING_H #undef HAVE_STPCPY
/* Define if you have the <strings.h> header file. */ /* Define to 1 if you have the `strcasecmp' function. */
#undef HAVE_STRCASECMP
/* Define to 1 if you have the `strchr' function. */
#undef HAVE_STRCHR
/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H #undef HAVE_STRINGS_H
/* Define if you have the <sys/param.h> header file. */ /* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
/* Define to 1 if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H #undef HAVE_SYS_PARAM_H
/* Define if you have the <sys/resource.h> header file. */ /* Define to 1 if you have the <sys/resource.h> header file. */
#undef HAVE_SYS_RESOURCE_H #undef HAVE_SYS_RESOURCE_H
/* Define if you have the <sys/time.h> header file. */ /* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
/* Define to 1 if you have the <sys/time.h> header file. */
#undef HAVE_SYS_TIME_H #undef HAVE_SYS_TIME_H
/* Define if you have the <time.h> header file. */ /* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
/* Define to 1 if you have the `time' function. */
#undef HAVE_TIME
/* Define to 1 if you have the <time.h> header file. */
#undef HAVE_TIME_H #undef HAVE_TIME_H
/* Define if you have the <unistd.h> header file. */ /* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H #undef HAVE_UNISTD_H
/* Define if you have the <values.h> header file. */ /* Define to 1 if you have the <values.h> header file. */
#undef HAVE_VALUES_H #undef HAVE_VALUES_H
/* Define to 1 if you have the `__argz_count' function. */
#undef HAVE___ARGZ_COUNT
/* Define to 1 if you have the `__argz_next' function. */
#undef HAVE___ARGZ_NEXT
/* Define to 1 if you have the `__argz_stringify' function. */
#undef HAVE___ARGZ_STRINGIFY
/* Define to 1 if you have the `__setfpucw' function. */
#undef HAVE___SETFPUCW
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
/* Define to the full name of this package. */
#undef PACKAGE_NAME
/* Define to the full name and version of this package. */
#undef PACKAGE_STRING
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
/* Define to the version of this package. */
#undef PACKAGE_VERSION
/* Define as the return type of signal handlers (`int' or `void'). */
#undef RETSIGTYPE
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
automatically deduced at run-time.
STACK_DIRECTION > 0 => grows toward higher addresses
STACK_DIRECTION < 0 => grows toward lower addresses
STACK_DIRECTION = 0 => direction of growth unknown */
#undef STACK_DIRECTION
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
/* Define to `__inline__' or `__inline' if that's what the C compiler
calls it, or to nothing if 'inline' is not supported under any name. */
#ifndef __cplusplus
#undef inline
#endif
/* Define to `long' if <sys/types.h> does not define. */
#undef off_t
/* Define to `unsigned' if <sys/types.h> does not define. */
#undef size_t

3
sim/arm/configure vendored
View file

@ -7034,7 +7034,8 @@ sim_link_links="${sim_link_links} targ-vals.def"
for ac_header in unistd.h
for ac_header in unistd.h stdint.h
do do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then if eval "test \"\${$as_ac_Header+set}\" = set"; then

2
sim/arm/configure.ac
View file

@ -9,7 +9,7 @@ sinclude(../common/aclocal.m4)
# it by inlining the macro's contents. # it by inlining the macro's contents.
sinclude(../common/common.m4) sinclude(../common/common.m4)
AC_CHECK_HEADERS(unistd.h) AC_CHECK_HEADERS(unistd.h stdint.h)
COPRO="armcopro.o maverick.o iwmmxt.o" COPRO="armcopro.o maverick.o iwmmxt.o"