Subversion Repositories HelenOS

Compare Revisions

Regard whitespace Rev 1882 → Rev 1888

/trunk/kernel/arch/ia64/include/interrupt.h
32,8 → 32,8
/** @file
*/
 
#ifndef __ia64_INTERRUPT_H__
#define __ia64_INTERRUPT_H__
#ifndef KERN_ia64_INTERRUPT_H_
#define KERN_ia64_INTERRUPT_H_
 
#include <typedefs.h>
#include <arch/types.h>
123,7 → 123,7
{
return istate->cr_iip;
}
#include <panic.h>
 
static inline int istate_from_uspace(istate_t *istate)
{
return (istate->cr_iip)<0xe000000000000000ULL;
139,10 → 139,7
extern void virtual_interrupt(uint64_t irq, void *param);
extern void disabled_fp_register(uint64_t vector, istate_t *istate);
 
 
 
#endif
 
/** @}
*/
 
/trunk/kernel/arch/ia64/include/fpu_context.h
32,8 → 32,8
/** @file
*/
 
#ifndef __ia64_FPU_CONTEXT_H__
#define __ia64_FPU_CONTEXT_H__
#ifndef KERN_ia64_FPU_CONTEXT_H_
#define KERN_ia64_FPU_CONTEXT_H_
 
#define ARCH_HAS_FPU 1
#define FPU_CONTEXT_ALIGN 16
46,9 → 46,7
__r128 fr[FRS];
};
 
 
#endif
 
/** @}
*/
 
/trunk/kernel/arch/ia64/include/byteorder.h
32,8 → 32,8
/** @file
*/
 
#ifndef __ia64_BYTEORDER_H__
#define __ia64_BYTEORDER_H__
#ifndef KERN_ia64_BYTEORDER_H_
#define KERN_ia64_BYTEORDER_H_
 
/* IA-64 is little-endian */
#define unative_t_le2host(n) (n)
43,4 → 43,3
 
/** @}
*/
 
/trunk/kernel/arch/ia64/include/ski/ski.h
32,8 → 32,8
/** @file
*/
 
#ifndef __SKI_H__
#define __SKI_H__
#ifndef KERN_ia64_SKI_H_
#define KERN_ia64_SKI_H_
 
#include <arch/types.h>
#include <console/console.h>
53,4 → 53,3
 
/** @}
*/
 
/trunk/kernel/arch/ia64/include/types.h
32,8 → 32,8
/** @file
*/
 
#ifndef __TYPES_H__
#define __TYPES_H__
#ifndef KERN_ia64_TYPES_H_
#define KERN_ia64_TYPES_H_
 
#define NULL 0
 
70,4 → 70,3
 
/** @}
*/
 
/trunk/kernel/arch/ia64/include/stack.h
32,8 → 32,8
/** @file
*/
 
#ifndef __ia64_STACK_H__
#define __ia64_STACK_H__
#ifndef KERN_ia64_STACK_H_
#define KERN_ia64_STACK_H_
 
#define STACK_ITEM_SIZE 8
#define STACK_ALIGNMENT 16
44,4 → 44,3
 
/** @}
*/
 
/trunk/kernel/arch/ia64/include/elf.h
32,8 → 32,8
/** @file
*/
 
#ifndef __ia64_ELF_H__
#define __ia64_ELF_H__
#ifndef KERN_ia64_ELF_H_
#define KERN_ia64_ELF_H_
 
#define ELF_MACHINE EM_IA_64
#define ELF_DATA_ENCODING ELFDATA2LSB
43,4 → 43,3
 
/** @}
*/
 
/trunk/kernel/arch/ia64/include/memstr.h
32,8 → 32,8
/** @file
*/
 
#ifndef __ia64_MEMSTR_H__
#define __ia64_MEMSTR_H__
#ifndef KERN_ia64_MEMSTR_H_
#define KERN_ia64_MEMSTR_H_
 
#define memcpy(dst, src, cnt) __builtin_memcpy((dst), (src), (cnt))
 
46,4 → 46,3
 
/** @}
*/
 
/trunk/kernel/arch/ia64/include/arg.h
32,8 → 32,8
/** @file
*/
 
#ifndef __ia64_ARG_H__
#define __ia64_ARG_H__
#ifndef KERN_ia64_ARG_H_
#define KERN_ia64_ARG_H_
 
#include <stdarg.h>
 
41,4 → 41,3
 
/** @}
*/
 
/trunk/kernel/arch/ia64/include/smp/atomic.h
File deleted
/trunk/kernel/arch/ia64/include/atomic.h
32,8 → 32,8
/** @file
*/
 
#ifndef __ia64_ATOMIC_H__
#define __ia64_ATOMIC_H__
#ifndef KERN_ia64_ATOMIC_H_
#define KERN_ia64_ATOMIC_H_
 
/** Atomic addition.
*
64,4 → 64,3
 
/** @}
*/
 
/trunk/kernel/arch/ia64/include/proc/task.h
32,8 → 32,8
/** @file
*/
 
#ifndef __ia64_TASK_H__
#define __ia64_TASK_H__
#ifndef KERN_ia64_TASK_H_
#define KERN_ia64_TASK_H_
 
typedef struct {
} task_arch_t;
45,4 → 45,3
 
/** @}
*/
 
/trunk/kernel/arch/ia64/include/asm.h
32,8 → 32,8
/** @file
*/
 
#ifndef __ia64_ASM_H__
#define __ia64_ASM_H__
#ifndef KERN_ia64_ASM_H_
#define KERN_ia64_ASM_H_
 
#include <config.h>
#include <arch/types.h>
283,4 → 283,3
 
/** @}
*/
 
/trunk/kernel/arch/ia64/include/mm/frame.h
32,8 → 32,8
/** @file
*/
 
#ifndef __ia64_FRAME_H__
#define __ia64_FRAME_H__
#ifndef KERN_ia64_FRAME_H_
#define KERN_ia64_FRAME_H_
 
#define FRAME_WIDTH 14 /* 16K */
#define FRAME_SIZE (1<<FRAME_WIDTH)
52,4 → 52,3
 
/** @}
*/
 
/trunk/kernel/arch/ia64/include/mm/memory_init.h
32,8 → 32,8
/** @file
*/
 
#ifndef __ia64_MEMORY_INIT_H__
#define __ia64_MEMORY_INIT_H__
#ifndef KERN_ia64_MEMORY_INIT_H_
#define KERN_ia64_MEMORY_INIT_H_
 
#include <config.h>
 
43,4 → 43,3
 
/** @}
*/
 
/trunk/kernel/arch/ia64/include/mm/page.h
33,8 → 33,8
/** @file
*/
 
#ifndef __ia64_PAGE_H__
#define __ia64_PAGE_H__
#ifndef KERN_ia64_PAGE_H_
#define KERN_ia64_PAGE_H_
 
#include <arch/mm/frame.h>
 
/trunk/kernel/arch/ia64/include/mm/asid.h
32,8 → 32,8
/** @file
*/
 
#ifndef __ia64_ASID_H__
#define __ia64_ASID_H__
#ifndef KERN_ia64_ASID_H_
#define KERN_ia64_ASID_H_
 
#ifndef __ASM__
 
64,4 → 64,3
 
/** @}
*/
 
/trunk/kernel/arch/ia64/include/mm/tlb.h
32,8 → 32,8
/** @file
*/
 
#ifndef __ia64_TLB_H__
#define __ia64_TLB_H__
#ifndef KERN_ia64_TLB_H_
#define KERN_ia64_TLB_H_
 
#define tlb_arch_init()
#define tlb_print()
102,4 → 102,3
 
/** @}
*/
 
/trunk/kernel/arch/ia64/include/mm/vhpt.h
32,10 → 32,9
/** @file
*/
#ifndef KERN_ia64_VHPT_H_
#define KERN_ia64_VHPT_H_
 
#ifndef __ia64_VHPT_H__
#define __ia64_VHPT_H__
 
#include <arch/mm/tlb.h>
#include <arch/mm/page.h>
 
55,10 → 54,7
void vhpt_invalidate_all(void);
void vhpt_invalidate_asid(asid_t asid);
 
 
#endif
 
 
/** @}
*/
 
/trunk/kernel/arch/ia64/include/mm/as.h
32,8 → 32,8
/** @file
*/
 
#ifndef __ia64_AS_H__
#define __ia64_AS_H__
#ifndef KERN_ia64_AS_H_
#define KERN_ia64_AS_H_
 
#define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH 0
 
50,4 → 50,3
 
/** @}
*/
 
/trunk/kernel/arch/ia64/include/context.h
32,8 → 32,8
/** @file
*/
 
#ifndef __ia64_CONTEXT_H__
#define __ia64_CONTEXT_H__
#ifndef KERN_ia64_CONTEXT_H_
#define KERN_ia64_CONTEXT_H_
 
#include <arch/types.h>
#include <arch/register.h>
134,4 → 134,3
 
/** @}
*/
 
/trunk/kernel/arch/ia64/include/register.h
32,8 → 32,8
/** @file
*/
 
#ifndef __ia64_REGISTER_H__
#define __ia64_REGISTER_H__
#ifndef KERN_ia64_REGISTER_H_
#define KERN_ia64_REGISTER_H_
 
#define CR_IVR_MASK 0xf
#define PSR_IC_MASK 0x2000
276,4 → 276,3
 
/** @}
*/
 
/trunk/kernel/arch/ia64/include/debug.h
33,11 → 33,10
/** @file
*/
 
#ifndef __ia64_DEBUG_H__
#define __ia64_DEBUG_H__
#ifndef KERN_ia64_DEBUG_H_
#define KERN_ia64_DEBUG_H_
 
#endif
 
/** @}
*/
 
/trunk/kernel/arch/ia64/include/barrier.h
32,8 → 32,8
/** @file
*/
 
#ifndef __ia64_BARRIER_H__
#define __ia64_BARRIER_H__
#ifndef KERN_ia64_BARRIER_H_
#define KERN_ia64_BARRIER_H_
 
/*
* TODO: Implement true IA-64 memory barriers for macros below.
52,4 → 52,3
 
/** @}
*/
 
/trunk/kernel/arch/ia64/include/pal/pal.h
32,8 → 32,8
/** @file
*/
 
#ifndef __ia64_PAL_H__
#define __ia64_PAL_H__
#ifndef KERN_ia64_PAL_H_
#define KERN_ia64_PAL_H_
 
#define PAL_OK 0 /**< Call completed without error. */
#define PAL_UNIMPL -1 /**< Unimplemented procedure. */
95,7 → 95,7
#define PAL_PMI_ENTRYPOINT 32
 
/*
Ski PTCE data
* Ski PTCE data
*/
#define PAL_PTCE_INFO_BASE() (0x100000000LL)
#define PAL_PTCE_INFO_COUNT1() (2)
103,9 → 103,7
#define PAL_PTCE_INFO_STRIDE1() (0x10000000)
#define PAL_PTCE_INFO_STRIDE2() (0x2000)
 
 
#endif
 
/** @}
*/
 
/trunk/kernel/arch/ia64/include/cpu.h
32,8 → 32,8
/** @file
*/
 
#ifndef __ia64_CPU_H__
#define __ia64_CPU_H__
#ifndef KERN_ia64_CPU_H_
#define KERN_ia64_CPU_H_
 
#include <arch/types.h>
#include <typedefs.h>
/trunk/kernel/arch/ia64/include/drivers/it.h
32,8 → 32,8
/** @file
*/
 
#ifndef __ia64_IT_H__
#define __ia64_IT_H__
#ifndef KERN_ia64_IT_H_
#define KERN_ia64_IT_H_
 
/*
* Unfortunately, Ski does not emulate PAL,
50,4 → 50,3
 
/** @}
*/
 
/trunk/kernel/arch/ia64/src/proc/scheduler.c
90,4 → 90,3
 
/** @}
*/
 
/trunk/kernel/arch/ia64/src/ia64.c
154,4 → 154,3
 
/** @}
*/
 
/trunk/kernel/arch/ia64/src/ski/ski.c
158,7 → 158,6
kb_disable = true;
}
 
 
static chardev_operations_t ski_ops = {
.resume = ski_kb_enable,
.suspend = ski_kb_disable,
166,7 → 165,6
.read = ski_getchar_blocking
};
 
 
/** Initialize debug console
*
* Issue SSC (Simulator System Call) to
188,6 → 186,7
stdout = &ski_console;
 
}
 
/** Setup console sysinfo (i.e. Keyboard IRQ)
*
* Because sysinfo neads memory allocation/dealocation
202,4 → 201,3
 
/** @}
*/
 
/trunk/kernel/arch/ia64/src/putchar.c
42,4 → 42,3
 
/** @}
*/
 
/trunk/kernel/arch/ia64/src/mm/vhpt.c
32,12 → 32,10
/** @file
*/
 
#include <arch/mm/vhpt.h>
#include <mm/frame.h>
#include <print.h>
 
 
static vhpt_entry_t* vhpt_base;
 
uintptr_t vhpt_set_up(void)
/trunk/kernel/arch/ia64/src/mm/as.c
87,4 → 87,3
 
/** @}
*/
 
/trunk/kernel/arch/ia64/src/mm/frame.c
56,4 → 56,3
 
/** @}
*/
 
/trunk/kernel/arch/ia64/src/mm/page.c
265,4 → 265,3
 
/** @}
*/
 
/trunk/kernel/arch/ia64/src/interrupt.c
216,12 → 216,7
istate->cr_ipsr.ri++;
}
 
if (istate->in4 < SYSCALL_END)
return syscall_table[istate->in4](istate->in0, istate->in1, istate->in2, istate->in3);
else
panic("Undefined syscall %d", istate->in4);
return -1;
return syscall_handler(istate->in0, istate->in1, istate->in2, istate->in3, istate->in4);
}
 
void universal_handler(uint64_t vector, istate_t *istate)