OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sim: assume recentish compiler/systems 

Assume the build system supports stdint.h/stdarg.h as those have been
around long enough and we don't care about pre-stdc compilers anymore.
This commit is contained in:
Mike Frysinger 2015-06-23 23:39:52 +05:45
parent 7564fe458c
commit b50a153264
6 changed files with 14 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sim/arm/ChangeLog
View File

@ -1,3 +1,10 @@
2015-06-23 Mike Frysinger <vapier@gentoo.org>
* armdefs.h: Always include stdint.h.
[!__STDC__]: Delete.
[!HAVE_STDINT_H]: Delete.
* dbg_hif.h [!__STDC__]: Delete.
2015-06-12 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.

13
sim/arm/armdefs.h
View File

@ -17,6 +17,7 @@
#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
#define FALSE 0
#define TRUE 1
@ -25,22 +26,10 @@
#define LOWHIGH 1
#define HIGHLOW 2
#ifndef __STDC__
typedef char *VoidStar;
#endif
#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 signed long long ARMsdword;
#endif
typedef struct ARMul_State ARMul_State;
typedef unsigned ARMul_CPInits (ARMul_State * state);

6
sim/arm/dbg_hif.h
View File

@ -14,11 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>. */
#ifdef __STDC__
# include <stdarg.h>
#else
# include <varargs.h>
#endif
#include <stdarg.h>
typedef void Hif_DbgPrint (void *arg, const char *format, va_list ap);
typedef void Hif_DbgPause (void *arg);

5
sim/common/ChangeLog
View File

@ -1,3 +1,8 @@
2015-06-23 Mike Frysinger <vapier@gentoo.org>
* cgen-trace.c [!__STDC__]: Delete.
* sim-trace.h [!__STDC__]: Likewise.
2015-06-21 Mike Frysinger <vapier@gentoo.org>
* sim-model.c (sim_model_init): Assert model is not NULL.

8
sim/common/cgen-trace.c
View File

@ -302,18 +302,10 @@ cgen_trace_printf (SIM_CPU *cpu, char *fmt, ...)
int
sim_disasm_sprintf (SFILE *f, const char *format, ...)
{
#ifndef __STDC__
SFILE *f;
const char *format;
#endif
int n;
va_list args;
va_start (args, format);
#ifndef __STDC__
f = va_arg (args, SFILE *);
format = va_arg (args, char *);
#endif
vsprintf (f->current, format, args);
f->current += n = strlen (f->current);
va_end (args);

18
sim/common/sim-trace.c
View File

@ -1294,19 +1294,9 @@ trace_one_insn (SIM_DESC sd, sim_cpu *cpu, address_word pc,
void
trace_printf (SIM_DESC sd, sim_cpu *cpu, const char *fmt, ...)
{
#if !defined __STDC__ && !defined ALMOST_STDC
SIM_DESC sd;
sim_cpu *cpu;
const char *fmt;
#endif
va_list ap;
va_start (ap, fmt);
#if !defined __STDC__ && !defined ALMOST_STDC
sd = va_arg (ap, SIM_DESC);
cpu = va_arg (ap, sim_cpu *);
fmt = va_arg (ap, const char *);
#endif
trace_vprintf (sd, cpu, fmt, ap);
@ -1316,17 +1306,9 @@ trace_printf (SIM_DESC sd, sim_cpu *cpu, const char *fmt, ...)
void
debug_printf (sim_cpu *cpu, const char *fmt, ...)
{
#if !defined __STDC__ && !defined ALMOST_STDC
sim_cpu *cpu;
const char *fmt;
#endif
va_list ap;
va_start (ap, fmt);
#if !defined __STDC__ && !defined ALMOST_STDC
cpu = va_arg (ap, sim_cpu *);
fmt = va_arg (ap, const char *);
#endif
if (CPU_DEBUG_FILE (cpu) == NULL)
(* STATE_CALLBACK (CPU_STATE (cpu))->evprintf_filtered)