RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2000-08-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* rtems/score/i386.h: cpu-variant define handling
	  Rewrite due to introduction of multilib defines.
	* asm.h: include cpuopts.h instead of targopts.h
This commit is contained in:
Joel Sherrill
2000-08-25 17:30:13 +00:00
parent dd53e2e697
commit 95990b57ea
7 changed files with 83 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
c/src/exec/score/cpu/i386/ChangeLog
View File

@@ -1,3 +1,9 @@
2000-08-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* rtems/score/i386.h: cpu-variant define handling
Rewrite due to introduction of multilib defines.
* asm.h: include cpuopts.h instead of targopts.h
2000-08-10 Joel Sherrill <joel@OARcorp.com>
* ChangeLog: New file.

2
c/src/exec/score/cpu/i386/asm.h
View File

@@ -33,7 +33,7 @@
#ifndef ASM
#define ASM
#endif
#include <rtems/score/targopts.h>
#include <rtems/score/cpuopts.h>
#include <rtems/score/i386.h>
/*

66
c/src/exec/score/cpu/i386/rtems/score/i386.h
View File

@@ -46,48 +46,46 @@ extern "C" {
*
*/
#if defined(rtems_multilib)
/*
* Figure out all CPU Model Feature Flags based upon compiler
* predefines.
*/
#define CPU_MODEL_NAME "rtems_multilib"
#if defined(_SOFT_FLOAT)
#define I386_HAS_FPU 0
#define I386_HAS_BSWAP 0
#else
#define I386_HAS_FPU 1
#endif
#elif defined(i386_fp)
#define CPU_MODEL_NAME "i386 with i387"
#define I386_HAS_BSWAP 0
#elif defined(i386_nofp)
#define CPU_MODEL_NAME "i386 w/o i387"
#define I386_HAS_FPU 0
#define I386_HAS_BSWAP 0
#elif defined(i486dx)
#define CPU_MODEL_NAME "i486dx"
#elif defined(i486sx)
#define CPU_MODEL_NAME "i486sx"
#define I386_HAS_FPU 0
#elif defined(pentium)
#define CPU_MODEL_NAME "Pentium"
#elif defined(pentiumpro)
#if defined(__pentiumpro__)
#define CPU_MODEL_NAME "Pentium Pro"
#elif defined(__i586__)
# if defined(__pentium__)
# define CPU_MODEL_NAME "Pentium"
# elsif defined(__k6__)
# define CPU_MODEL_NAME "K6"
# else
# define CPU_MODEL_NAME "i586"
# endif
#error "Unsupported CPU Model"
#elif defined(__i486__)
# if !defined(_SOFT_FLOAT)
# define CPU_MODEL_NAME "i486dx"
# else
# define CPU_MODEL_NAME "i486sx"
# endif
#elif defined(__i386__)
#define I386_HAS_BSWAP 0
# if !defined(_SOFT_FLOAT)
# define CPU_MODEL_NAME "i386 with i387"
# else
# define CPU_MODEL_NAME "i386 w/o i387"
# endif
#else
#error "Unknown CPU Model"
#endif
/*

6
cpukit/score/cpu/i386/ChangeLog
View File

@@ -1,3 +1,9 @@
2000-08-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* rtems/score/i386.h: cpu-variant define handling
Rewrite due to introduction of multilib defines.
* asm.h: include cpuopts.h instead of targopts.h
2000-08-10 Joel Sherrill <joel@OARcorp.com>
* ChangeLog: New file.

2
cpukit/score/cpu/i386/asm.h
View File

@@ -33,7 +33,7 @@
#ifndef ASM
#define ASM
#endif
#include <rtems/score/targopts.h>
#include <rtems/score/cpuopts.h>
#include <rtems/score/i386.h>
/*

2
cpukit/score/cpu/i386/rtems/asm.h
View File

@@ -33,7 +33,7 @@
#ifndef ASM
#define ASM
#endif
#include <rtems/score/targopts.h>
#include <rtems/score/cpuopts.h>
#include <rtems/score/i386.h>
/*

66
cpukit/score/cpu/i386/rtems/score/i386.h
View File

@@ -46,48 +46,46 @@ extern "C" {
*
*/
#if defined(rtems_multilib)
/*
* Figure out all CPU Model Feature Flags based upon compiler
* predefines.
*/
#define CPU_MODEL_NAME "rtems_multilib"
#if defined(_SOFT_FLOAT)
#define I386_HAS_FPU 0
#define I386_HAS_BSWAP 0
#else
#define I386_HAS_FPU 1
#endif
#elif defined(i386_fp)
#define CPU_MODEL_NAME "i386 with i387"
#define I386_HAS_BSWAP 0
#elif defined(i386_nofp)
#define CPU_MODEL_NAME "i386 w/o i387"
#define I386_HAS_FPU 0
#define I386_HAS_BSWAP 0
#elif defined(i486dx)
#define CPU_MODEL_NAME "i486dx"
#elif defined(i486sx)
#define CPU_MODEL_NAME "i486sx"
#define I386_HAS_FPU 0
#elif defined(pentium)
#define CPU_MODEL_NAME "Pentium"
#elif defined(pentiumpro)
#if defined(__pentiumpro__)
#define CPU_MODEL_NAME "Pentium Pro"
#elif defined(__i586__)
# if defined(__pentium__)
# define CPU_MODEL_NAME "Pentium"
# elsif defined(__k6__)
# define CPU_MODEL_NAME "K6"
# else
# define CPU_MODEL_NAME "i586"
# endif
#error "Unsupported CPU Model"
#elif defined(__i486__)
# if !defined(_SOFT_FLOAT)
# define CPU_MODEL_NAME "i486dx"
# else
# define CPU_MODEL_NAME "i486sx"
# endif
#elif defined(__i386__)
#define I386_HAS_BSWAP 0
# if !defined(_SOFT_FLOAT)
# define CPU_MODEL_NAME "i386 with i387"
# else
# define CPU_MODEL_NAME "i386 w/o i387"
# endif
#else
#error "Unknown CPU Model"
#endif
/*