Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 1026 → Rev 1056

/shark/trunk/oslib/ll/i386/x-bios.h
45,10 → 45,10
WORD _pad __attribute__ ((packed));
} x __attribute__ ((packed));
struct {
BYTE al,ah __attribute__ ((packed));
BYTE bl,bh __attribute__ ((packed));
BYTE cl,ch __attribute__ ((packed));
BYTE dl,dh __attribute__ ((packed));
BYTE al,ah __attribute__ ((packed));
BYTE bl,bh __attribute__ ((packed));
BYTE cl,ch __attribute__ ((packed));
BYTE dl,dh __attribute__ ((packed));
} h __attribute__ ((packed));
} X_REGS16;
 
/shark/trunk/oslib/ll/i386/mem.h
136,6 → 136,7
}
 
#define __HAVE_ARCH_MEMCPY
 
#define memcpy(t, f, n) \
(__builtin_constant_p(n) ? \
__constant_memcpy((t),(f),(n)) : \
/shark/trunk/oslib/ll/i386/hw-data.h
64,8 → 64,8
typedef struct gate {
WORD offset_lo __attribute__ ((packed));
WORD sel __attribute__ ((packed));
BYTE dword_cnt __attribute__ ((packed));
BYTE access __attribute__ ((packed));
BYTE dword_cnt __attribute__ ((packed));
BYTE access __attribute__ ((packed));
WORD offset_hi __attribute__ ((packed));
} GATE;
 
72,10 → 72,10
typedef struct descriptor {
WORD lim_lo __attribute__ ((packed));
WORD base_lo __attribute__ ((packed));
BYTE base_med __attribute__ ((packed));
BYTE access __attribute__ ((packed));
BYTE gran __attribute__ ((packed));
BYTE base_hi __attribute__ ((packed));
BYTE base_med __attribute__ ((packed));
BYTE access __attribute__ ((packed));
BYTE gran __attribute__ ((packed));
BYTE base_hi __attribute__ ((packed));
} DESCRIPTOR;
 
/* A LDT/GDT entry could be a gate or a selector */
200,7 → 200,7
WORD trap __attribute__ ((packed));
WORD io_base __attribute__ ((packed));
DWORD control __attribute__ ((packed));
BYTE ctx_FPU[FPU_CONTEXT_SIZE] __attribute__ ((packed));
BYTE ctx_FPU[FPU_CONTEXT_SIZE] __attribute__ ((packed));
} TSS;
 
/* Irq services specifications */
/shark/trunk/oslib/libc/reboot.c
70,6 → 70,6
for(j = 0; j < 100000 ; j++);
}
/* That didn't work - force a triple fault.. */
__asm__ __volatile__("lidt %0": :"m" (no_idt));
__asm__ __volatile__("int3");
// __asm__ __volatile__("lidt %0": :"m" (no_idt));
// __asm__ __volatile__("int3");
}
/shark/trunk/oslib/config.mk
40,7 → 40,7
CFG_OPT += -D__OLD_TRACER__
endif
 
C_OPT = -Wall -O -fno-builtin -nostdinc $(CFG_OPT) -DMAIN=__kernel_init__ -I$(INCL)
C_OPT = -Wall -O -fno-builtin -nostdinc -Wno-attributes -Wno-pointer-sign -minline-all-stringops $(CFG_OPT) -DMAIN=__kernel_init__ -I$(INCL)
ASM_OPT = -x assembler-with-cpp $(CFG_OPT) -I$(INCL)
LINK_OPT = -Bstatic -Ttext $(MEM_START) -s -nostartfiles -nostdlib -L$(LIB_PATH)