Changeset 6ecc8bce in mainline


Ignore:
Timestamp:
2006-04-23T12:46:01Z (19 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
ad45bde9
Parents:
12c7f27
Message:

Make ia64 and sparc64 compile again.
Fix ia64 to set up inits in arch_pre_main().

Files:
12 edited

Legend:

Unmodified
Added
Removed

  • arch/amd64/src/ddi/ddi.c

    r12c7f27 r6ecc8bce  
    9696 *
    9797 * @param enable If non-zero, interrupts are enabled, otherwise disabled
    98  * @param flags CP0 flags register
     98 * @param flags RFLAGS register
    9999 */
    100100__native ddi_int_control_arch(__native enable, __native *flags)

  • arch/ia32/src/ddi/ddi.c

    r12c7f27 r6ecc8bce  
    9393}
    9494
    95 /** Enable/disable interrupts form syscall
     95/** Enable/disable interrupts for syscall
    9696 *
    9797 * @param enable If non-zero, interrupts are enabled, otherwise disabled
    98  * @param flags CP0 flags register
     98 * @param flags EFLAGS flags register
    9999 */
    100100__native ddi_int_control_arch(__native enable, __native *flags)

  • arch/ia64/src/ddi/ddi.c

    r12c7f27 r6ecc8bce  
    4646        return 0;
    4747}
     48
     49/** Enable/disable interrupts for syscall
     50 *
     51 * @param enable If non-zero, interrupts are enabled, otherwise disabled
     52 * @param flags PSR register.
     53 */
     54__native ddi_int_control_arch(__native enable, __native *flags)
     55{
     56        /* TODO: not implemented. */
     57        return 0;       
     58}

  • arch/ia64/src/ia64.c

    r12c7f27 r6ecc8bce  
    4545#include <syscall/syscall.h>
    4646
     47void arch_pre_main(void)
     48{
     49        /* Setup usermode init tasks. */
     50        init.cnt = 2;
     51        init.tasks[0].addr = INIT0_ADDRESS;
     52        init.tasks[0].size = INIT0_SIZE;
     53        init.tasks[1].addr = INIT1_ADDRESS;
     54        init.tasks[1].size = INIT1_SIZE;
     55}
     56
    4757void arch_pre_mm_init(void)
    4858{
    … …  
    5262       
    5363        ski_init_console();
    54         it_init();
    55        
    56         /* Setup usermode */
    57         init.cnt = 2;
    58         init.tasks[0].addr = INIT0_ADDRESS;
    59         init.tasks[0].size = INIT0_SIZE;
    60         init.tasks[1].addr = INIT1_ADDRESS;
    61         init.tasks[1].size = INIT1_SIZE;
     64        it_init();     
    6265}
    6366

  • arch/ia64/src/start.S

    r12c7f27 r6ecc8bce  
    129129        srlz.d;;
    130130
     131        br.call.sptk.many b0 = arch_pre_main
    131132
    132133        movl r18=main_bsp ;;

  • arch/mips32/include/arch.h

    r12c7f27 r6ecc8bce  
    3030#define __mips32_ARCH_H__
    3131
    32 extern void arch_pre_main(void);
    33 
    3432#endif

  • arch/mips32/src/ddi/ddi.c

    r12c7f27 r6ecc8bce  
    5050}
    5151
    52 /** Enable/disable interrupts form syscall
     52/** Enable/disable interrupts for syscall
    5353 *
    5454 * @param enable If non-zero, interrupts are enabled, otherwise disabled
    55  * @param flags CP0 flags register
     55 * @param flags CP0 status register
    5656 */
    5757__native ddi_int_control_arch(__native enable, __native *flags)

  • arch/ppc32/include/arch.h

    r12c7f27 r6ecc8bce  
    3030#define __ppc32_ARCH_H__
    3131
    32 extern void arch_pre_main(void);
    33 
    3432#endif

  • arch/ppc32/src/ddi/ddi.c

    r12c7f27 r6ecc8bce  
    4747}
    4848
    49 /** Enable/disable interrupts form syscall
     49/** Enable/disable interrupts for syscall
    5050 *
    5151 * @param enable If non-zero, interrupts are enabled, otherwise disabled
    52  * @param flags CP0 flags register
     52 * @param flags PPC32 register holding interrupt state.
    5353 */
    5454__native ddi_int_control_arch(__native enable, __native *flags)

  • arch/sparc64/src/ddi/ddi.c

    r12c7f27 r6ecc8bce  
    4646        return 0;
    4747}
     48
     49/** Enable/disable interrupts for syscall
     50 *
     51 * @param enable If non-zero, interrupts are enabled, otherwise disabled
     52 * @param flags PSTATE register.
     53 */
     54__native ddi_int_control_arch(__native enable, __native *flags)
     55{
     56        /* TODO: not implemented. */
     57        return 0;
     58}

  • generic/include/arch.h

    r12c7f27 r6ecc8bce  
    6262extern void the_copy(the_t *src, the_t *dst);
    6363
     64extern void arch_pre_main(void);
    6465extern void arch_pre_mm_init(void);
    6566extern void arch_post_mm_init(void);

  • generic/src/ipc/ipc.c

    r12c7f27 r6ecc8bce  
    115115}
    116116
    117 /** Initialize phone structure and connect phone to naswerbox
     117/** Initialize phone structure and connect phone to answerbox
    118118 */
    119119void ipc_phone_init(phone_t *phone)
Note: See TracChangeset for help on using the changeset viewer.