Subversion Repositories HelenOS-historic

Compare Revisions

Ignore whitespace Rev 195 → Rev 194

/SPARTAN/trunk/arch/amd64/Makefile.inc
10,7 → 10,7
 
DEFS=-DARCH=$(ARCH)
CPPFLAGS=$(DEFS) -nostdinc -I../include
CFLAGS=$(CPPFLAGS) -nostdlib -fno-builtin -fno-unwind-tables -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -march=opteron -m64 -mcmodel=kernel -mno-red-zone
CFLAGS=$(CPPFLAGS) -nostdlib -fno-builtin -fno-unwind-tables -Wmissing-prototypes -Werror -O3 -march=opteron -m64 -mcmodel=kernel -mno-red-zone
LFLAGS=-M -T ../arch/amd64/_link.ld
 
arch_sources = arch/dummy.s \
/SPARTAN/trunk/arch/ppc/Makefile.inc
11,7 → 11,7
 
DEFS=-DARCH=$(ARCH)
CPPFLAGS=$(DEFS) -nostdinc -I../include
CFLAGS=$(CPPFLAGS) -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O2
CFLAGS=$(CPPFLAGS) -nostdlib -fno-builtin -Wmissing-prototypes -Werror -O2
LFLAGS=-M -no-check-sections -T ../arch/ppc/_link.ld
 
arch_sources= \
/SPARTAN/trunk/arch/ia64/include/asm.h
47,9 → 47,4
return v;
}
 
 
void cpu_sleep(void);
 
void asm_delay_loop(__u32 t);
 
#endif
/SPARTAN/trunk/arch/ia64/Makefile.inc
11,7 → 11,7
 
DEFS=-DARCH=$(ARCH)
CPPFLAGS=$(DEFS) -nostdinc -I../include
CFLAGS=$(CPPFLAGS) -mconstant-gp -nostdlib -fno-builtin -fno-unwind-tables -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3
CFLAGS=$(CPPFLAGS) -mconstant-gp -nostdlib -fno-builtin -fno-unwind-tables -Wmissing-prototypes -Werror -O3
LFLAGS=-EL -M -T ../arch/ia64/_link.ld
 
arch_sources= \
/SPARTAN/trunk/arch/mips/include/asm.h
49,7 → 49,4
return v;
}
 
void asm_delay_loop(__u32 t);
 
 
#endif
/SPARTAN/trunk/arch/mips/Makefile.inc
11,7 → 11,7
 
DEFS=-DARCH=$(ARCH)
CPPFLAGS=$(DEFS) -mno-abicalls -nostdinc -I../include
CFLAGS=$(CPPFLAGS) -mips2 -G 0 -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O2
CFLAGS=$(CPPFLAGS) -mips2 -G 0 -nostdlib -fno-builtin -Wmissing-prototypes -Werror -O2
LFLAGS=-mips2 -M -no-check-sections -T ../arch/mips/_link.ld
 
arch_sources= \
/SPARTAN/trunk/arch/mips/src/mm/tlb.c
33,11 → 33,6
#include <panic.h>
#include <arch.h>
 
void main_bsp(void);
 
 
 
 
int bootstrap = 1;
 
void tlb_refill(void)
/SPARTAN/trunk/arch/mips/src/mm/page.c
31,7 → 31,6
#include <arch/mm/frame.h>
#include <mm/frame.h>
#include <mm/page.h>
#include <memstr.h>
 
pte_t *PTL0 = NULL;
 
/SPARTAN/trunk/arch/mips/src/cpu/cpu.c
34,7 → 34,6
#include <arch/cp0.h>
 
#include <typedefs.h>
#include <print.h>
 
struct {
char *vendor;
/SPARTAN/trunk/arch/mips/src/exception.c
27,7 → 27,6
*/
 
#include <arch/exception.h>
#include <arch/interrupt.h>
#include <panic.h>
#include <arch/cp0.h>
#include <arch/types.h>
/SPARTAN/trunk/arch/ia32/include/asm.h
52,11 → 52,6
 
extern void enable_l_apic_in_msr(void);
 
 
void asm_delay_loop(__u32 t);
void asm_fake_loop(__u32 t);
 
 
/** Halt CPU
*
* Halt the current CPU until interrupt event.
/SPARTAN/trunk/arch/ia32/src/ia32.c
45,12 → 45,8
#include <arch/interrupt.h>
#include <arch/asm.h>
#include <arch/acpi/acpi.h>
 
#include <arch/bios/bios.h>
 
#include <arch/mm/memory_init.h>
 
 
void arch_pre_mm_init(void)
{
pm_init();
/SPARTAN/trunk/arch/ia32/src/mm/memory_init.c
28,7 → 28,6
 
#include <arch/boot/memmap.h>
#include <arch/mm/memory_init.h>
#include <print.h>
 
size_t get_memory_size(void)
{
/SPARTAN/trunk/arch/ia32/src/mm/page.c
36,7 → 36,6
#include <arch/asm.h>
#include <synch/spinlock.h>
#include <debug.h>
#include <memstr.h>
 
__address bootstrap_dba;
 
72,7 → 71,7
*/
 
dba = frame_alloc(FRAME_KA | FRAME_PANIC);
memcopy((void *)dba,(void *)bootstrap_dba , PAGE_SIZE); //swaped
memcopy(bootstrap_dba, dba, PAGE_SIZE);
write_cr3(KA2PA(dba));
}
 
/SPARTAN/trunk/arch/ia32/src/smp/smp.c
42,9 → 42,6
#include <mm/frame.h>
#include <mm/page.h>
#include <mm/heap.h>
#include <print.h>
#include <memstr.h>
#include <arch/i8259.h>
 
#ifdef __SMP__
 
139,8 → 136,8
if (!(gdt_new = (struct descriptor *) malloc(GDT_ITEMS*sizeof(struct descriptor))))
panic("couldn't allocate memory for GDT\n");
 
memcopy(gdt_new, gdt, GDT_ITEMS*sizeof(struct descriptor)); // swaped
memsetb((__address)(&gdt_new[TSS_DES]), sizeof(struct descriptor), 0);
memcopy(gdt, gdt_new, GDT_ITEMS*sizeof(struct descriptor));
memsetb(&gdt_new[TSS_DES], sizeof(struct descriptor), 0);
gdtr.base = KA2PA((__address) gdt_new);
 
if (l_apic_send_init_ipi(ops->cpu_apic_id(i))) {
/SPARTAN/trunk/arch/ia32/src/smp/mps.c
40,7 → 40,6
#include <cpu.h>
#include <arch/asm.h>
#include <arch/bios/bios.h>
#include <mm/frame.h>
 
/*
* MultiProcessor Specification detection code.
/SPARTAN/trunk/arch/ia32/src/pm.c
35,8 → 35,6
#include <arch/context.h>
#include <panic.h>
#include <arch/mm/page.h>
#include <mm/heap.h>
#include <memstr.h>
 
/*
* Early ia32 configuration functions and data structures.
/SPARTAN/trunk/arch/ia32/src/drivers/ega.c
33,7 → 33,6
#include <synch/spinlock.h>
#include <arch/types.h>
#include <arch/asm.h>
#include <memstr.h>
 
/*
* The EGA driver.
73,7 → 72,7
if (ega_cursor < SCREEN)
return;
 
memcopy((void *)PA2KA(VIDEORAM),(void *)PA2KA(VIDEORAM) + ROW*2, (SCREEN - ROW)*2); //swaped
memcopy(PA2KA(VIDEORAM) + ROW*2, PA2KA(VIDEORAM), (SCREEN - ROW)*2);
memsetw(PA2KA(VIDEORAM) + (SCREEN - ROW)*2, ROW, 0x0720);
ega_cursor = ega_cursor - ROW;
}
/SPARTAN/trunk/arch/ia32/src/drivers/i8259.c
31,7 → 31,6
#include <arch/types.h>
#include <arch/asm.h>
#include <arch.h>
#include <print.h>
 
/*
* This is the PIC driver.
/SPARTAN/trunk/arch/ia32/src/drivers/i8254.c
36,9 → 36,7
#include <config.h>
#include <arch/pm.h>
#include <arch/asm.h>
#include <arch/cpuid.h>
#include <arch.h>
#include <time/delay.h>
 
/*
* i8254 chip driver.
/SPARTAN/trunk/arch/ia32/src/acpi/madt.c
35,7 → 35,6
#include <panic.h>
#include <debug.h>
#include <config.h>
#include <print.h>
 
struct acpi_madt *acpi_madt = NULL;
 
/SPARTAN/trunk/arch/ia32/src/acpi/acpi.c
31,7 → 31,6
#include <arch/bios/bios.h>
 
#include <mm/page.h>
#include <print.h>
 
#define RSDP_SIGNATURE "RSD PTR "
#define RSDP_REVISION_OFFS 15
/SPARTAN/trunk/arch/ia32/Makefile.inc
13,7 → 13,7
endif
 
CPPFLAGS=$(DEFS) -nostdinc -I../include
CFLAGS=$(CPPFLAGS) -nostdlib -fno-builtin -fomit-frame-pointer -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3
CFLAGS=$(CPPFLAGS) -nostdlib -fno-builtin -fomit-frame-pointer -Wmissing-prototypes -Werror -O3
LFLAGS=-M -no-check-sections -T ../arch/ia32/_link.ld
 
arch_sources= \
/SPARTAN/trunk/include/cpu.h
74,8 → 74,6
extern cpu_t *cpus;
 
extern void cpu_init(void);
extern void cpu_halt(void);
 
extern void cpu_arch_init(void);
extern void cpu_identify(void);
extern void cpu_print_report(cpu_t *m);
/SPARTAN/trunk/include/memstr.h
32,7 → 32,7
#include <typedefs.h>
#include <arch/types.h>
 
extern char * memcopy(void * dst, const void *src, size_t cnt);
extern void memcopy(__address src, __address dst, size_t cnt);
 
extern void memsetw(__address dst, size_t cnt, __u16 x);
extern void memsetb(__address dst, size_t cnt, __u8 x);
42,7 → 42,7
/*
* Architecture independent variants.
*/
extern char * _memcopy(void *dst, const void *src, size_t cnt);
extern void _memcopy(__address src, __address dst, size_t cnt);
extern void _memsetb(__address dst, size_t cnt, __u8 x);
 
#endif
/SPARTAN/trunk/src/Makefile.config
34,4 → 34,3
#TEST_DIR=synch/semaphore2/
#TEST_DIR=fpu/fpu1
#TEST_DIR=print/print1
TEST_DIR=thread/thread1
/SPARTAN/trunk/src/main/kinit.c
40,7 → 40,6
#include <mm/page.h>
#include <arch/mm/page.h>
#include <mm/vm.h>
#include <print.h>
 
#ifdef __SMP__
#include <arch/smp/mps.h>
/SPARTAN/trunk/src/main/uinit.c
30,9 → 30,7
#include <arch/types.h>
#include <proc/thread.h>
#include <userspace.h>
#include <print.h>
 
 
void uinit(void *arg)
{
printf("USER task, uinit thread: kernel mode\n");
/SPARTAN/trunk/src/proc/scheduler.c
43,11 → 43,7
#include <synch/spinlock.h>
#include <arch/faddr.h>
#include <arch/atomic.h>
#include <print.h>
#include <mm/frame.h>
#include <mm/heap.h>
 
 
volatile int nrdy;
 
 
361,9 → 357,8
}
THREAD = NULL;
}
printf("*0*");
 
THREAD = find_best_thread();
printf("*1*");
spinlock_lock(&THREAD->lock);
priority = THREAD->pri;
/SPARTAN/trunk/src/proc/thread.c
50,7 → 50,6
#include <smp/ipi.h>
#include <arch/faddr.h>
#include <arch/atomic.h>
#include <memstr.h>
 
char *thread_states[] = {"Invalid", "Running", "Sleeping", "Ready", "Entering", "Exiting"}; /**< Thread states */
 
/SPARTAN/trunk/src/lib/memstr.c
41,16 → 41,12
* @param cnt Number of bytes to copy.
*
*/
 
char * _memcopy(void * dst,const void *src, size_t cnt);
char * _memcopy(void * dst,const void *src, size_t cnt)
void _memcopy(__address src, __address dst, size_t cnt)
{
int i;
for (i=0; i<cnt; i++)
*((__u8 *) (dst + i)) = *((__u8 *) (src + i));
return (char *)src;
}
 
 
/SPARTAN/trunk/src/debug/print.c
31,7 → 31,6
#include <synch/spinlock.h>
#include <arch/arg.h>
#include <arch/asm.h>
#include <arch.h>
 
 
static char digits[] = "0123456789abcdef"; /**< Hexadecimal characters */
/SPARTAN/trunk/src/mm/vm.c
40,8 → 40,6
#include <panic.h>
#include <arch/asm.h>
#include <debug.h>
#include <memstr.h>
#include <arch.h>
 
#define KAS_START_INDEX PTL0_INDEX(KERNEL_ADDRESS_SPACE_START)
#define KAS_END_INDEX PTL0_INDEX(KERNEL_ADDRESS_SPACE_END)
68,7 → 66,7
dst_ptl0 = (pte_t *) frame_alloc(FRAME_KA | FRAME_PANIC);
// memsetb((__address) dst_ptl0, PAGE_SIZE, 0);
// memcopy((__address) &src_ptl0[KAS_START_INDEX], (__address) &dst_ptl0[KAS_START_INDEX], KAS_INDICES*sizeof(pte_t));
memcopy((void *)PA2KA((__address) dst_ptl0), (void *)GET_PTL0_ADDRESS() , PAGE_SIZE);
memcopy(PA2KA((__address) GET_PTL0_ADDRESS()), (__address) dst_ptl0, PAGE_SIZE);
m->ptl0 = (pte_t *) KA2PA((__address) dst_ptl0);
}
}
/SPARTAN/trunk/src/mm/page.c
32,9 → 32,7
#include <arch/types.h>
#include <typedefs.h>
#include <arch/asm.h>
#include <memstr.h>
 
 
void page_init(void)
{
page_arch_init();
/SPARTAN/trunk/src/mm/frame.c
43,7 → 43,6
#include <synch/spinlock.h>
 
#include <arch/asm.h>
#include <arch.h>
 
count_t frames = 0;
count_t frames_free;
/SPARTAN/trunk/src/mm/heap.c
33,7 → 33,6
#include <panic.h>
#include <arch/types.h>
#include <arch/asm.h>
#include <arch.h>
 
/*
* First-fit algorithm.
/SPARTAN/trunk/src/synch/spinlock.c
31,7 → 31,6
#include <arch/atomic.h>
#include <arch/barrier.h>
#include <synch/spinlock.h>
#include <print.h>
 
#ifdef __SMP__
 
/SPARTAN/trunk/src/synch/semaphore.c
31,7 → 31,6
#include <synch/waitq.h>
#include <synch/spinlock.h>
#include <arch/asm.h>
#include <arch.h>
 
void semaphore_initialize(semaphore_t *s, int val)
{
/SPARTAN/trunk/test/thread/thread1/test.c
File deleted