HelenOSHelenOS-docHelenOS-historic

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

  → /trunk/kernel/arch/mips32/ @ 2632

  → /trunk/kernel/arch/mips32/ @ 2633

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 2632 → Rev 2633

/trunk/kernel/arch/mips32/include/interrupt.h
42,6 → 42,7
#define IVT_FIRST 0
extern function virtual_timer_fnc;
extern uint32_t count_hi;
extern void interrupt_init(void);

/trunk/kernel/arch/mips32/include/cycle.h
35,9 → 35,12
#ifndef KERN_mips32_CYCLE_H_
#define KERN_mips32_CYCLE_H_
#include <arch/cp0.h>
#include <arch/interrupt.h>
static inline uint64_t get_cycle(void)
{
return 0;
return ((uint64_t) count_hi << 32) + ((uint64_t) cp0_count_read());
}
#endif

/trunk/kernel/arch/mips32/src/interrupt.c
89,10 → 89,14
}
/* TODO: This is SMP unsafe!!! */
uint32_t count_hi = 0;
static unsigned long nextcount;
static unsigned long lastcount;
/** Start hardware clock */
static void timer_start(void)
{
lastcount = cp0_count_read();
nextcount = cp0_compare_value + cp0_count_read();
cp0_compare_write(nextcount);
}
105,7 → 109,13
static void timer_irq_handler(irq_t *irq, void *arg, ...)
{
unsigned long drift;
if (cp0_count_read() < lastcount) {
/* Count overflow detection */
count_hi++;
lastcount = cp0_count_read();
}
drift = cp0_count_read() - nextcount;
while (drift > cp0_compare_value) {
drift -= cp0_compare_value;
113,7 → 123,7
}
nextcount = cp0_count_read() + cp0_compare_value - drift;
cp0_compare_write(nextcount);
/*
* We are holding a lock which prevents preemption.
* Release the lock, call clock() and reacquire the lock again.