sim: switch config.h usage to defs.h

The defs.h header will take care of including the various config.h
headers.  For now, it's just config.h, but we'll add more when we
integrate gnulib in.

This header should be used instead of config.h, and should be the
first include in every .c file.  We won't rely on the old behavior
where we expected files to include the port's sim-main.h which then
includes the common sim-basics.h which then includes config.h.  We
have a ton of code that includes things before sim-main.h, and it
sometimes needs to be that way.  Creating a dedicated header avoids
the ordering mess and implicit inclusion that shows up otherwise.
This commit is contained in:
Mike Frysinger
2021-05-01 18:05:23 -04:00
parent 681eb80f12
commit 6df01ab8ab
302 changed files with 923 additions and 169 deletions

View File

@ -1,3 +1,10 @@
2021-05-16 Mike Frysinger <vapier@gentoo.org>
* armcopro.c, armemu.c, arminit.c, armsupp.c, armvirt.c, iwmmxt.c,
maverick.c, thumbemu.c: Include defs.h.
* armos.c, wrapper.c: Replace config.h include with defs.h.
* armdefs.h: Delete config.h include.
2021-05-16 Mike Frysinger <vapier@gentoo.org>
* config.in, configure: Regenerate.

View File

@ -14,6 +14,9 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>. */
/* This must come before any other includes. */
#include "defs.h"
#include "armdefs.h"
#include "armos.h"
#include "armemu.h"

View File

@ -14,7 +14,6 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>. */
#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>

View File

@ -15,6 +15,9 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>. */
/* This must come before any other includes. */
#include "defs.h"
#include "armdefs.h"
#include "armemu.h"
#include "armos.h"

View File

@ -14,6 +14,9 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>. */
/* This must come before any other includes. */
#include "defs.h"
#include <string.h>
#include "armdefs.h"

View File

@ -21,7 +21,9 @@
fun, and definign VAILDATE will define SWI 1 to enter SVC mode, and SWI
0x11 to halt the emulator. */
#include "config.h"
/* This must come before any other includes. */
#include "defs.h"
#include "ansidecl.h"
#include "libiberty.h"

View File

@ -14,6 +14,9 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>. */
/* This must come before any other includes. */
#include "defs.h"
#include "armdefs.h"
#include "armemu.h"
#include "ansidecl.h"

View File

@ -22,6 +22,9 @@
freed as they might be needed again. A single area of memory may be
defined to generate aborts. */
/* This must come before any other includes. */
#include "defs.h"
#include "armos.h"
#include "armdefs.h"
#include "ansidecl.h"

View File

@ -15,6 +15,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* This must come before any other includes. */
#include "defs.h"
#include <stdlib.h>
#include <string.h>

View File

@ -15,6 +15,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* This must come before any other includes. */
#include "defs.h"
#include <assert.h>
#include "armdefs.h"
#include "ansidecl.h"

View File

@ -18,6 +18,9 @@
instruction into its corresponding ARM instruction, and using the
existing ARM simulator. */
/* This must come before any other includes. */
#include "defs.h"
#ifndef MODET /* required for the Thumb instruction support */
#if 1
#error "MODET needs to be defined for the Thumb world to work"

View File

@ -20,7 +20,9 @@
run.c and gdb (when the simulator is linked with gdb).
All simulator interaction should go through this file. */
#include "config.h"
/* This must come before any other includes. */
#include "defs.h"
#include <stdio.h>
#include <stdarg.h>
#include <stdlib.h>