Changeset 9c0a9b3 in mainline


Ignore:
Timestamp:
2005-08-30T19:44:27Z (19 years ago)
Author:
Jakub Vana <jakub.vana@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
d0c30f7
Parents:
8fc0d455
Message:

1) memcopy and _memcopy functions rewriten to ANSI C norm.
2) Repaired ia32,ia64 and mips version of SPARTAN to work with this memcopy functions
3) Warning for non declared funcions added and repaired ia32,ia64 and mips versions to pass build process with this warning and Werror option

Files:
1 added
38 edited

Legend:

Unmodified
Added
Removed

  • arch/amd64/Makefile.inc

    r8fc0d455 r9c0a9b3  
    1111DEFS=-DARCH=$(ARCH)
    1212CPPFLAGS=$(DEFS) -nostdinc -I../include
    13 CFLAGS=$(CPPFLAGS) -nostdlib -fno-builtin -fno-unwind-tables -Wmissing-prototypes -Werror -O3 -march=opteron -m64 -mcmodel=kernel -mno-red-zone
     13CFLAGS=$(CPPFLAGS) -nostdlib -fno-builtin -fno-unwind-tables -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -march=opteron -m64 -mcmodel=kernel -mno-red-zone
    1414LFLAGS=-M -T ../arch/amd64/_link.ld
    1515

  • arch/ia32/Makefile.inc

    r8fc0d455 r9c0a9b3  
    1414
    1515CPPFLAGS=$(DEFS) -nostdinc -I../include
    16 CFLAGS=$(CPPFLAGS) -nostdlib -fno-builtin -fomit-frame-pointer -Wmissing-prototypes -Werror -O3
     16CFLAGS=$(CPPFLAGS) -nostdlib -fno-builtin -fomit-frame-pointer -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3
    1717LFLAGS=-M -no-check-sections -T ../arch/ia32/_link.ld
    1818

  • arch/ia32/include/asm.h

    r8fc0d455 r9c0a9b3  
    5252
    5353extern void enable_l_apic_in_msr(void);
     54
     55
     56void asm_delay_loop(__u32 t);
     57void asm_fake_loop(__u32 t);
     58
    5459
    5560/** Halt CPU

  • arch/ia32/src/acpi/acpi.c

    r8fc0d455 r9c0a9b3  
    3232
    3333#include <mm/page.h>
     34#include <print.h>
    3435
    3536#define RSDP_SIGNATURE          "RSD PTR "

  • arch/ia32/src/acpi/madt.c

    r8fc0d455 r9c0a9b3  
    3636#include <debug.h>
    3737#include <config.h>
     38#include <print.h>
    3839
    3940struct acpi_madt *acpi_madt = NULL;

  • arch/ia32/src/drivers/ega.c

    r8fc0d455 r9c0a9b3  
    3434#include <arch/types.h>
    3535#include <arch/asm.h>
     36#include <memstr.h>
    3637
    3738/*
    … …  
    7374                return;
    7475
    75         memcopy(PA2KA(VIDEORAM) + ROW*2, PA2KA(VIDEORAM), (SCREEN - ROW)*2);
     76        memcopy((void *)PA2KA(VIDEORAM),(void *)PA2KA(VIDEORAM) + ROW*2, (SCREEN - ROW)*2); //swaped
    7677        memsetw(PA2KA(VIDEORAM) + (SCREEN - ROW)*2, ROW, 0x0720);
    7778        ega_cursor = ega_cursor - ROW;

  • arch/ia32/src/drivers/i8254.c

    r8fc0d455 r9c0a9b3  
    3737#include <arch/pm.h>
    3838#include <arch/asm.h>
     39#include <arch/cpuid.h>
    3940#include <arch.h>
     41#include <time/delay.h>
    4042
    4143/*

  • arch/ia32/src/drivers/i8259.c

    r8fc0d455 r9c0a9b3  
    3232#include <arch/asm.h>
    3333#include <arch.h>
     34#include <print.h>
    3435
    3536/*

  • arch/ia32/src/ia32.c

    r8fc0d455 r9c0a9b3  
    4646#include <arch/asm.h>
    4747#include <arch/acpi/acpi.h>
     48
     49#include <arch/bios/bios.h>
     50
    4851#include <arch/mm/memory_init.h>
     52
    4953
    5054void arch_pre_mm_init(void)

  • arch/ia32/src/mm/memory_init.c

    r8fc0d455 r9c0a9b3  
    2929#include <arch/boot/memmap.h>
    3030#include <arch/mm/memory_init.h>
     31#include <print.h>
    3132
    3233size_t get_memory_size(void)

  • arch/ia32/src/mm/page.c

    r8fc0d455 r9c0a9b3  
    3737#include <synch/spinlock.h>
    3838#include <debug.h>
     39#include <memstr.h>
    3940
    4041__address bootstrap_dba;
    … …  
    7273
    7374                dba = frame_alloc(FRAME_KA | FRAME_PANIC);
    74                 memcopy(bootstrap_dba, dba, PAGE_SIZE);
     75                memcopy((void *)dba,(void *)bootstrap_dba , PAGE_SIZE); //swaped
    7576                write_cr3(KA2PA(dba));
    7677        }

  • arch/ia32/src/pm.c

    r8fc0d455 r9c0a9b3  
    3636#include <panic.h>
    3737#include <arch/mm/page.h>
     38#include <mm/heap.h>
     39#include <memstr.h>
    3840
    3941/*

  • arch/ia32/src/smp/mps.c

    r8fc0d455 r9c0a9b3  
    4141#include <arch/asm.h>
    4242#include <arch/bios/bios.h>
     43#include <mm/frame.h>
    4344
    4445/*

  • arch/ia32/src/smp/smp.c

    r8fc0d455 r9c0a9b3  
    4343#include <mm/page.h>
    4444#include <mm/heap.h>
     45#include <print.h>
     46#include <memstr.h>
     47#include <arch/i8259.h>
    4548
    4649#ifdef __SMP__
    … …  
    137140                        panic("couldn't allocate memory for GDT\n");
    138141
    139                 memcopy(gdt, gdt_new, GDT_ITEMS*sizeof(struct descriptor));
    140                 memsetb(&gdt_new[TSS_DES], sizeof(struct descriptor), 0);
     142                memcopy(gdt_new, gdt, GDT_ITEMS*sizeof(struct descriptor));           // swaped
     143                memsetb((__address)(&gdt_new[TSS_DES]), sizeof(struct descriptor), 0);
    141144                gdtr.base = KA2PA((__address) gdt_new);
    142145

  • arch/ia64/Makefile.inc

    r8fc0d455 r9c0a9b3  
    1212DEFS=-DARCH=$(ARCH)
    1313CPPFLAGS=$(DEFS) -nostdinc -I../include
    14 CFLAGS=$(CPPFLAGS) -mconstant-gp -nostdlib -fno-builtin -fno-unwind-tables -Wmissing-prototypes -Werror -O3
     14CFLAGS=$(CPPFLAGS) -mconstant-gp -nostdlib -fno-builtin -fno-unwind-tables -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3
    1515LFLAGS=-EL -M -T ../arch/ia64/_link.ld
    1616

  • arch/ia64/include/asm.h

    r8fc0d455 r9c0a9b3  
    4848}
    4949
     50
     51void cpu_sleep(void);
     52
     53void asm_delay_loop(__u32 t);
     54
    5055#endif

  • arch/mips/Makefile.inc

    r8fc0d455 r9c0a9b3  
    1212DEFS=-DARCH=$(ARCH)
    1313CPPFLAGS=$(DEFS) -mno-abicalls -nostdinc -I../include
    14 CFLAGS=$(CPPFLAGS) -mips2 -G 0 -nostdlib -fno-builtin -Wmissing-prototypes -Werror -O2
     14CFLAGS=$(CPPFLAGS) -mips2 -G 0 -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O2
    1515LFLAGS=-mips2 -M -no-check-sections -T ../arch/mips/_link.ld
    1616

  • arch/mips/include/asm.h

    r8fc0d455 r9c0a9b3  
    5050}
    5151
     52void asm_delay_loop(__u32 t);
     53
     54
    5255#endif

  • arch/mips/src/cpu/cpu.c

    r8fc0d455 r9c0a9b3  
    3535
    3636#include <typedefs.h>
     37#include <print.h>
    3738
    3839struct {

  • arch/mips/src/exception.c

    r8fc0d455 r9c0a9b3  
    2828
    2929#include <arch/exception.h>
     30#include <arch/interrupt.h>
    3031#include <panic.h>
    3132#include <arch/cp0.h>

  • arch/mips/src/mm/page.c

    r8fc0d455 r9c0a9b3  
    3232#include <mm/frame.h>
    3333#include <mm/page.h>
     34#include <memstr.h>
    3435
    3536pte_t *PTL0 = NULL;

  • arch/mips/src/mm/tlb.c

    r8fc0d455 r9c0a9b3  
    3434#include <arch.h>
    3535
     36void main_bsp(void);
     37
     38
     39
     40
    3641int bootstrap = 1;
    3742

  • arch/ppc/Makefile.inc

    r8fc0d455 r9c0a9b3  
    1212DEFS=-DARCH=$(ARCH)
    1313CPPFLAGS=$(DEFS) -nostdinc -I../include
    14 CFLAGS=$(CPPFLAGS) -nostdlib -fno-builtin -Wmissing-prototypes -Werror -O2
     14CFLAGS=$(CPPFLAGS) -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O2
    1515LFLAGS=-M -no-check-sections -T ../arch/ppc/_link.ld
    1616

  • include/cpu.h

    r8fc0d455 r9c0a9b3  
    7575
    7676extern void cpu_init(void);
     77extern void cpu_halt(void);
     78
    7779extern void cpu_arch_init(void);
    7880extern void cpu_identify(void);

  • include/memstr.h

    r8fc0d455 r9c0a9b3  
    3333#include <arch/types.h>
    3434
    35 extern void memcopy(__address src, __address dst, size_t cnt);
     35extern char *  memcopy(void * dst, const void *src, size_t cnt);
    3636
    3737extern void memsetw(__address dst, size_t cnt, __u16 x);
    … …  
    4343 * Architecture independent variants.
    4444 */
    45 extern void _memcopy(__address src, __address dst, size_t cnt);
     45extern char * _memcopy(void *dst, const void *src, size_t cnt);
    4646extern void _memsetb(__address dst, size_t cnt, __u8 x);
    4747

  • src/Makefile.config

    r8fc0d455 r9c0a9b3  
    3535#TEST_DIR=fpu/fpu1
    3636#TEST_DIR=print/print1
     37TEST_DIR=thread/thread1

  • src/debug/print.c

    r8fc0d455 r9c0a9b3  
    3232#include <arch/arg.h>
    3333#include <arch/asm.h>
     34#include <arch.h>
    3435
    3536

  • src/lib/memstr.c

    r8fc0d455 r9c0a9b3  
    4242 *
    4343 */
    44 void _memcopy(__address src, __address dst, size_t cnt)
     44
     45char *  _memcopy(void * dst,const void *src, size_t cnt);
     46char *  _memcopy(void * dst,const void *src, size_t cnt)
    4547{
    4648        int i;
    … …  
    4850        for (i=0; i<cnt; i++)
    4951                *((__u8 *) (dst + i)) = *((__u8 *) (src + i));
     52               
     53        return (char *)src;
    5054}
    5155

  • src/main/kinit.c

    r8fc0d455 r9c0a9b3  
    4141#include <arch/mm/page.h>
    4242#include <mm/vm.h>
     43#include <print.h>
    4344
    4445#ifdef __SMP__

  • src/main/uinit.c

    r8fc0d455 r9c0a9b3  
    3131#include <proc/thread.h>
    3232#include <userspace.h>
     33#include <print.h>
     34
    3335
    3436void uinit(void *arg)

  • src/mm/frame.c

    r8fc0d455 r9c0a9b3  
    4444
    4545#include <arch/asm.h>
     46#include <arch.h>
    4647
    4748count_t frames = 0;

  • src/mm/heap.c

    r8fc0d455 r9c0a9b3  
    3434#include <arch/types.h>
    3535#include <arch/asm.h>
     36#include <arch.h>
    3637
    3738/*

  • src/mm/page.c

    r8fc0d455 r9c0a9b3  
    3333#include <typedefs.h>
    3434#include <arch/asm.h>
     35#include <memstr.h>
     36
    3537
    3638void page_init(void)

  • src/mm/vm.c

    r8fc0d455 r9c0a9b3  
    4141#include <arch/asm.h>
    4242#include <debug.h>
     43#include <memstr.h>
     44#include <arch.h>
    4345
    4446#define KAS_START_INDEX         PTL0_INDEX(KERNEL_ADDRESS_SPACE_START)
    … …  
    6769//                      memsetb((__address) dst_ptl0, PAGE_SIZE, 0);
    6870//                      memcopy((__address) &src_ptl0[KAS_START_INDEX], (__address) &dst_ptl0[KAS_START_INDEX], KAS_INDICES*sizeof(pte_t));
    69                         memcopy(PA2KA((__address) GET_PTL0_ADDRESS()), (__address) dst_ptl0, PAGE_SIZE);
     71                        memcopy((void *)PA2KA((__address) dst_ptl0), (void *)GET_PTL0_ADDRESS() , PAGE_SIZE);
    7072                        m->ptl0 = (pte_t *) KA2PA((__address) dst_ptl0);
    7173                }

  • src/proc/scheduler.c

    r8fc0d455 r9c0a9b3  
    4444#include <arch/faddr.h>
    4545#include <arch/atomic.h>
     46#include <print.h>
     47#include <mm/frame.h>
     48#include <mm/heap.h>
     49
    4650
    4751volatile int nrdy;
    … …  
    358362                THREAD = NULL;
    359363        }
    360 
     364        printf("*0*");
    361365        THREAD = find_best_thread();
     366        printf("*1*");
    362367       
    363368        spinlock_lock(&THREAD->lock);

  • src/proc/thread.c

    r8fc0d455 r9c0a9b3  
    5151#include <arch/faddr.h>
    5252#include <arch/atomic.h>
     53#include <memstr.h>
    5354
    5455char *thread_states[] = {"Invalid", "Running", "Sleeping", "Ready", "Entering", "Exiting"}; /**< Thread states */

  • src/synch/semaphore.c

    r8fc0d455 r9c0a9b3  
    3232#include <synch/spinlock.h>
    3333#include <arch/asm.h>
     34#include <arch.h>
    3435
    3536void semaphore_initialize(semaphore_t *s, int val)

  • src/synch/spinlock.c

    r8fc0d455 r9c0a9b3  
    3232#include <arch/barrier.h>
    3333#include <synch/spinlock.h>
     34#include <print.h>
    3435
    3536#ifdef __SMP__
Note: See TracChangeset for help on using the changeset viewer.