HelenOS-historicHelenOSHelenOS-doc

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /kernel/ @ 631

  → /kernel/ @ 632

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 631 → Rev 632

/kernel/trunk/arch/sparc64/include/memstr.h
29,7 → 29,7
#ifndef __sparc64_MEMSTR_H__
#define __sparc64_MEMSTR_H__
#define memcpy(dst, src, cnt) __builtin_memcpy((dst), (src), (cnt));
#define memcpy(dst, src, cnt) __builtin_memcpy((dst), (src), (cnt))
extern void memsetw(__address dst, size_t cnt, __u16 x);
extern void memsetb(__address dst, size_t cnt, __u8 x);

/kernel/trunk/arch/sparc64/include/trap/regwin.h
63,6 → 63,7
#define I6_OFFSET 112
#define I7_OFFSET 120
#ifdef __ASM__
.macro SPILL_NORMAL_HANDLER
stx %l0, [%sp + STACK_BIAS + L0_OFFSET]
stx %l1, [%sp + STACK_BIAS + L1_OFFSET]
125,5 → 126,6
mov %r0, %i5
retry
.endm
#endif /* __ASM__ */
#endif

/kernel/trunk/arch/sparc64/include/trap/trap_table.h
46,6 → 46,6
extern trap_table_entry_t trap_table[TRAP_TABLE_ENTRY_COUNT];
extern trap_table_entry_t trap_table_kernel[TRAP_TABLE_ENTRY_COUNT];
#endif /* __ASM__ */
#endif /* !__ASM__ */
#endif

/kernel/trunk/arch/sparc64/include/trap/trap.h
40,5 → 40,6
}
extern void trap_init(void);
extern void trap_install_handler(index_t tt, size_t len, bool tlnonz);
#endif

/kernel/trunk/arch/sparc64/src/trap/trap.c
28,8 → 28,12
#include <arch/trap/trap.h>
#include <arch/trap/trap_table.h>
#include <arch/trap/regwin.h>
#include <arch/asm.h>
#include <memstr.h>
#include <debug.h>
#include <arch/types.h>
#include <typedefs.h>
/** Initialize trap table. */
void trap_init(void)
38,4 → 42,37
* Copy OFW's trap table into kernel.
*/
memcpy((void *) trap_table, (void *) tba_read(), TRAP_TABLE_SIZE);
/*
* Install kernel-provided handlers.
*/
trap_install_handler(TT_CLEAN_WINDOW, CLEAN_WINDOW_HANDLER_SIZE, false);
trap_install_handler(TT_SPILL_0_NORMAL, SPILL_HANDLER_SIZE, false);
trap_install_handler(TT_FILL_0_NORMAL, FILL_HANDLER_SIZE, false);
}
/** Copy trap handler to active trap table.
*
* The handler is copied from trap_table_kernel to trap_handler.
*
* @param tt Trap type. An index that uniquelly identifies handler code.
* @param len Length of the handler in bytes. Must be multiple of TRAP_TABLE_ENTRY_SIZE (i.e. 32).
* @param tlnonz If false, tt is considered from the lower half of trap table. If true, the upper half is chosen.
*/
void trap_install_handler(index_t tt, size_t len, bool tlnonz)
{
count_t cnt;
int i;
ASSERT(tt < TRAP_TABLE_ENTRY_COUNT/2);
ASSERT(len % TRAP_TABLE_ENTRY_SIZE == 0);
if (tlnonz)
tt += TRAP_TABLE_ENTRY_COUNT/2;
cnt = len/TRAP_TABLE_ENTRY_SIZE;
for (i = tt; i < tt + cnt; i++) {
trap_table[i] = trap_table_kernel[i];
}
}