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

  → /branches/tracing/kernel/arch/ @ 2920

  → /branches/tracing/kernel/arch/ @ 2921

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 2920 → Rev 2921

/branches/tracing/kernel/arch/amd64/src/debugger.c
328,6 → 328,19
unative_t dr6;
int i;
dr6 = read_dr6();
if (dr6 & DR6_BS) {
if (THREAD && istate_from_uspace(istate)) {
/*
* The userspace thread has TF set and executed
* an instruction
*/
udebug_trap_event(istate->eip);
return;
}
}
/* Set RF to restart the instruction */
#ifdef amd64
istate->rflags |= RFLAGS_RF;
335,7 → 348,6
istate->eflags |= EFLAGS_RF;
#endif
dr6 = read_dr6();
for (i=0; i < BKPOINTS_MAX; i++) {
if (dr6 & (1 << i)) {
dr6 &= ~ (1 << i);

/branches/tracing/kernel/arch/ia32/include/cpu.h
54,6 → 54,10
#define CR4_OSFXSR_MASK (1<<9)
#define DR6_BT (1<<15)
#define DR6_BS (1<<14)
#define DR6_BD (1<<13)
#endif
/** @}