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/trunk/generic @ 1212

  → /kernel/trunk/generic @ 1221

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 1212 → Rev 1221

/kernel/trunk/generic/include/debug.h
49,7 → 49,7
*
*/
#ifdef CONFIG_DEBUG
# define ASSERT(expr) if (!(expr)) { panic("assertion failed (%s), caller=%P\n", #expr, CALLER); }
# define ASSERT(expr) if (!(expr)) { panic("assertion failed (%s), caller=%p\n", #expr, CALLER); }
#else
# define ASSERT(expr)
#endif

/kernel/trunk/generic/src/main/main.c
176,8 → 176,7
arch_post_mm_init();
version_print();
printf("%#zX: hardcoded_ktext_size=%zdK, hardcoded_kdata_size=%zdK\n",
config.base, hardcoded_ktext_size/1024, hardcoded_kdata_size/1024);
printf("%#zx: hardcoded_ktext_size=%zdK, hardcoded_kdata_size=%zdK\n", config.base, hardcoded_ktext_size / 1024, hardcoded_kdata_size / 1024);
arch_pre_smp_init();
smp_init();
196,7 → 195,7
futex_init();
for (i = 0; i < init.cnt; i++)
printf("init[%zd].addr=%P, init[%zd].size=%zd\n", i, init.tasks[i].addr, i, init.tasks[i].size);
printf("init[%zd].addr=%p, init[%zd].size=%zd\n", i, init.tasks[i].addr, i, init.tasks[i].size);
ipc_init();

/kernel/trunk/generic/src/proc/scheduler.c
633,7 → 633,7
continue;
spinlock_lock(&cpus[cpu].lock);
printf("cpu%d: address=%P, nrdy=%ld, needs_relink=%ld\n",
printf("cpu%d: address=%p, nrdy=%ld, needs_relink=%ld\n",
cpus[cpu].id, &cpus[cpu], atomic_get(&cpus[cpu].nrdy), cpus[cpu].needs_relink);
for (i=0; i<RQ_COUNT; i++) {

/kernel/trunk/generic/src/adt/btree.c
117,7 → 117,7
lnode = leaf_node;
if (!lnode) {
if (btree_search(t, key, &lnode)) {
panic("B-tree %P already contains key %d\n", t, key);
panic("B-tree %p already contains key %d\n", t, key);
}
}
200,7 → 200,7
lnode = leaf_node;
if (!lnode) {
if (!btree_search(t, key, &lnode)) {
panic("B-tree %P does not contain key %d\n", t, key);
panic("B-tree %p does not contain key %d\n", t, key);
}
}
500,7 → 500,7
return;
}
}
panic("node %P does not contain key %d\n", node, key);
panic("node %p does not contain key %d\n", node, key);
}
/** Remove key and its right subtree pointer from B-tree node.
527,7 → 527,7
return;
}
}
panic("node %P does not contain key %d\n", node, key);
panic("node %p does not contain key %d\n", node, key);
}
/** Split full B-tree node and insert new key-value-right-subtree triplet.
669,7 → 669,7
if (subtree == node->subtree[i])
return i - (int) (right != false);
}
panic("node %P does not contain subtree %P\n", node, subtree);
panic("node %p does not contain subtree %p\n", node, subtree);
}
/** Rotate one key-value-rsubtree triplet from the left sibling to the right sibling.

/kernel/trunk/generic/src/mm/frame.c
1028,8 → 1028,7
for (i = 0; i < zones.count; i++) {
zone = zones.info[i];
spinlock_lock(&zone->lock);
printf("%d: %#X \t%zd\t\t%zd\n",i,PFN2ADDR(zone->base),
zone->free_count, zone->busy_count);
printf("%d: %#x \t%zd\t\t%zd\n", i, PFN2ADDR(zone->base), zone->free_count, zone->busy_count);
spinlock_unlock(&zone->lock);
}
spinlock_unlock(&zones.lock);

/kernel/trunk/generic/src/mm/page.c
63,11 → 63,11
{
int i, cnt, length;
length = size + (s - (s & ~(PAGE_SIZE-1)));
cnt = length/PAGE_SIZE + (length%PAGE_SIZE>0);
length = size + (s - (s & ~(PAGE_SIZE - 1)));
cnt = length / PAGE_SIZE + (length % PAGE_SIZE > 0);
for (i = 0; i < cnt; i++)
page_mapping_insert(AS_KERNEL, s + i*PAGE_SIZE, s + i*PAGE_SIZE, PAGE_NOT_CACHEABLE);
page_mapping_insert(AS_KERNEL, s + i * PAGE_SIZE, s + i * PAGE_SIZE, PAGE_NOT_CACHEABLE);
}