Changes in / [f27f3fd:da904f7] in mainline

Files:

• kernel/Makefile (modified) (5 diffs)
• kernel/arch/ia32/Makefile.inc (modified) (1 diff)
• kernel/arch/ia32/include/arch/istate.h (modified) (1 diff)
• kernel/arch/ia32/include/arch/istate_struct.ag (deleted)
• kernel/arch/ia32/src/asm.S (modified) (2 diffs)
• tools/autogen.py (deleted)
• tools/autotool.py (modified) (1 diff)
• uspace/lib/c/arch/ia32/include/libarch/istate_struct.h (deleted)

kernel/Makefile

@@ -66 +66 @@
 SIZEOK_MAP = generic/src/debug/sizeok_map.o
 
-.PHONY: all clean autogen_clean
+.PHONY: all clean
 
 all: $(VERSION_DEF) $(COMMON_MAKEFILE) $(COMMON_HEADER) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(BIN) $(DISASM)
         -[ -f $(DEPEND) ] && cp -a $(DEPEND) $(DEPEND_PREV)
 
-clean: autogen_clean
+clean:
         rm -f $(DEPEND) $(DEPEND_PREV) $(RAW) $(BIN) $(MAP) $(JOB) $(MAP_PREV) $(DISASM) $(DUMP) $(REAL_MAP).* arch/*/_link.ld arch/*/include/arch/common.h
-        find generic/src/ arch/*/src/ genarch/src/ test/ -name '*.o' -follow -exec rm '{}' \;
+        find generic/src/ arch/*/src/ genarch/src/ test/ -name '*.o' -follow -exec rm \{\} \;
 
 ## Common compiler flags
@@ -367 +367 @@
 GENARCH_OBJECTS := $(addsuffix .o,$(basename $(GENARCH_SOURCES)))
 
-ARCH_AUTOGENS_H := $(addsuffix .h,$(basename $(ARCH_AUTOGENS_AG)))
-ARCH_AUTOGENS_PROBE_C := $(addsuffix .ag.probe.c,$(basename $(ARCH_AUTOGENS_AG)))
-ARCH_AUTOGENS_PROBE_S := $(addsuffix .ag.probe.s,$(basename $(ARCH_AUTOGENS_AG)))
-
 LFLAGS_LTO := $(addprefix -Xlinker ,$(LFLAGS))
 
@@ -401 +397 @@
 $(LINK): $(LINK).in $(DEPEND)
         $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -D__LINKER__ -E -x c $< | grep -v "^\#" > $@
-
-%.h: %.ag
-        $(AUTOGEN) probe $< >$<.probe.c
-        $(GCC) $(DEFS) $(GCC_CFLAGS) -S -o $<.probe.s $<.probe.c
-        $(AUTOGEN) generate $< <$<.probe.s >$@   
 
 %.o: %.S $(DEPEND)
@@ -450 +441 @@
         $(GENMAP) $(MAP_PREV) $(DUMP) $@
 
-$(DEPEND): $(COMMON_HEADER_ARCH) $(ARCH_AUTOGENS_H)
+$(DEPEND): $(COMMON_HEADER_ARCH)
         makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENARCH_SOURCES) $(GENERIC_SOURCES) > $@ 2> /dev/null
         -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@
@@ -456 +447 @@
 $(COMMON_HEADER_ARCH): $(COMMON_HEADER)
         ln -sfn ../../../../$< $@
-
-autogen_clean:
-        -rm $(ARCH_AUTOGENS_H) $(ARCH_AUTOGENS_PROBE_C) $(ARCH_AUTOGENS_PROBE_S)

kernel/arch/ia32/Makefile.inc

@@ -105 +105 @@
         arch/$(KARCH)/src/fpu_context.c \
         arch/$(KARCH)/src/syscall.c
-
-ARCH_AUTOGENS_AG = \
-        arch/$(KARCH)/include/arch/istate_struct.ag
-

kernel/arch/ia32/include/arch/istate.h

@@ -38 +38 @@
 #include <trace.h>
 
-#ifdef KERNEL
-#include <arch/istate_struct.h>
-#else
-#include <libarch/istate_struct.h>
-#endif /* KERNEL */
+typedef struct istate {
+        /*
+         * The strange order of the GPRs is given by the requirement to use the
+         * istate structure for both regular interrupts and exceptions as well
+         * as for syscall handlers which use this order as an optimization.
+         */
+        uint32_t edx;
+        uint32_t ecx;
+        uint32_t ebx;
+        uint32_t esi;
+        uint32_t edi;
+        uint32_t ebp;
+        uint32_t eax;
+        
+        uint32_t ebp_frame;  /* imitation of frame pointer linkage */
+        uint32_t eip_frame;  /* imitation of return address linkage */
+        
+        uint32_t gs;
+        uint32_t fs;
+        uint32_t es;
+        uint32_t ds;
+        
+        uint32_t error_word;  /* real or fake error word */
+        uint32_t eip;
+        uint32_t cs;
+        uint32_t eflags;
+        uint32_t esp;         /* only if istate_t is from uspace */
+        uint32_t ss;          /* only if istate_t is from uspace */
+} istate_t;
 
 #define RPL_USER        3

kernel/arch/ia32/src/asm.S

@@ -34 +34 @@
 #include <arch/cpu.h>
 #include <arch/mm/page.h>
-#include <arch/istate_struct.h>
 
 .text
@@ -137 +136 @@
         ret
 
+#define ISTATE_OFFSET_EDX         0
+#define ISTATE_OFFSET_ECX         4
+#define ISTATE_OFFSET_EBX         8
+#define ISTATE_OFFSET_ESI         12
+#define ISTATE_OFFSET_EDI         16 
+#define ISTATE_OFFSET_EBP         20
+#define ISTATE_OFFSET_EAX         24
+#define ISTATE_OFFSET_EBP_FRAME   28
+#define ISTATE_OFFSET_EIP_FRAME   32
+#define ISTATE_OFFSET_GS          36
+#define ISTATE_OFFSET_FS          40
+#define ISTATE_OFFSET_ES          44
+#define ISTATE_OFFSET_DS          48
+#define ISTATE_OFFSET_ERROR_WORD  52
+#define ISTATE_OFFSET_EIP         56
+#define ISTATE_OFFSET_CS          60
+#define ISTATE_OFFSET_EFLAGS      64
+#define ISTATE_OFFSET_ESP         68
+#define ISTATE_OFFSET_SS          72
+
 /*
  * Size of the istate structure without the hardware-saved part
  * and without the error word.
  */
-#define ISTATE_SOFT_SIZE        ISTATE_SIZE - (6 * 4) 
+#define ISTATE_SOFT_SIZE  52
 
 /*

tools/autotool.py

@@ -834 +834 @@
                 sandbox_leave(owd)
         
-        common['AUTOGEN'] = "%s/autogen.py" % os.path.dirname(os.path.abspath(sys.argv[0]))
-
         create_makefile(MAKEFILE, common)
         create_header(HEADER, maps)