4 files changed, 36 insertions, 11 deletions
diff --git a/c/src/exec/score/cpu/i386/asm.h b/c/src/exec/score/cpu/i386/asm.h
index adf92f935a..aac1ba9dbe 100644
--- a/c/src/exec/score/cpu/i386/asm.h
+++ b/c/src/exec/score/cpu/i386/asm.h
@@ -31,7 +31,7 @@
  */
 
 #define ASM
-#include <rtems/i386.h>
+#include <rtems/core/i386.h>
 
 /*
  *  Recent versions of GNU cpp define variables which indicate the
diff --git a/c/src/exec/score/cpu/i386/cpu.c b/c/src/exec/score/cpu/i386/cpu.c
index d1ceaba88a..446515d6f9 100644
--- a/c/src/exec/score/cpu/i386/cpu.c
+++ b/c/src/exec/score/cpu/i386/cpu.c
@@ -15,8 +15,8 @@
 
 #include <rtems/system.h>
 #include <rtems/fatal.h>
-#include <rtems/isr.h>
-#include <rtems/wkspace.h>
+#include <rtems/core/isr.h>
+#include <rtems/core/wkspace.h>
 
 /*  _CPU_Initialize
  *
@@ -36,9 +36,6 @@ void _CPU_Initialize(
   register unsigned16  fp_status asm ("ax");
   register unsigned8  *fp_context;
 
-  if ( cpu_table == NULL )
-    rtems_fatal_error_occurred( RTEMS_NOT_CONFIGURED );
-
   _CPU_Table = *cpu_table;
 
   /*
@@ -69,6 +66,20 @@ void _CPU_Initialize(
 
 /*PAGE
  *
+ *  _CPU_ISR_Get_level
+ */
+ 
+unsigned32 _CPU_ISR_Get_level( void )
+{
+  unsigned32 level;
+ 
+  i386_get_interrupt_level( level );
+ 
+  return level;
+}
+ 
+/*PAGE
+ *
  *  _CPU_ISR_install_raw_handler
  */
  
diff --git a/c/src/exec/score/cpu/i386/cpu.h b/c/src/exec/score/cpu/i386/cpu.h
index 2af0096fc6..f3793cd443 100644
--- a/c/src/exec/score/cpu/i386/cpu.h
+++ b/c/src/exec/score/cpu/i386/cpu.h
@@ -22,9 +22,9 @@ extern "C" {
 #endif
 
 #ifndef ASM
-#include <rtems/i386types.h>
+#include <rtems/core/i386types.h>
 #endif
-#include <rtems/i386.h>
+#include <rtems/core/i386.h>
 
 /* conditional compilation parameters */
 
@@ -119,9 +119,9 @@ typedef struct {
 
 /* variables */
 
-EXTERN unsigned8  _CPU_Null_fp_context[ CPU_CONTEXT_FP_SIZE ];
-EXTERN void      *_CPU_Interrupt_stack_low;
-EXTERN void      *_CPU_Interrupt_stack_high;
+EXTERN Context_Control_fp  _CPU_Null_fp_context;
+EXTERN void               *_CPU_Interrupt_stack_low;
+EXTERN void               *_CPU_Interrupt_stack_high;
 
 /* constants */
 
@@ -192,6 +192,8 @@ EXTERN void      *_CPU_Interrupt_stack_high;
     else              asm volatile ( "sti" ); \
   }
 
+unsigned32 _CPU_ISR_Get_level( void );
+
 /* end of ISR handler macros */
 
 /*
diff --git a/c/src/exec/score/cpu/i386/i386.h b/c/src/exec/score/cpu/i386/i386.h
index 3ebde48ed3..d43669ba53 100644
--- a/c/src/exec/score/cpu/i386/i386.h
+++ b/c/src/exec/score/cpu/i386/i386.h
@@ -166,6 +166,18 @@ typedef struct {
     ); \
   }
 
+#define i386_get_interrupt_level( _level ) \
+  do { \
+    register unsigned32 _eflags = 0; \
+    \
+    asm volatile ( "push %0 ; \
+                    popf " \
+                    : "=r" ((_eflags)) : "0" ((_eflags)) \
+    ); \
+    \
+    _level = (_eflags & 0x0200) ? 0 : 1; \
+  } while (0)
+
 /*
  *  The following routine swaps the endian format of an unsigned int.
  *  It must be static so it can be referenced indirectly.