Changeset 7f043c0 in mainline for kernel/generic

Timestamp:

2007-05-31T21:39:13Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7bb0c32

Parents:

d8431986

Message:

fix ICC compilation

Location:

kernel/generic

Files:

• include/interrupt.h (modified) (1 diff)
• src/printf/printf_core.c (modified) (2 diffs)

kernel/generic/include/interrupt.h

@@ -49 +49 @@
 { \
         if (istate_from_uspace(istate)) { \
-                klog_printf("Task %llu killed due to an exception at %p.", TASK->taskid, istate_get_pc(istate)); \
+                task_t *task = TASK; \
+                klog_printf("Task %llu killed due to an exception at %p.", task->taskid, istate_get_pc(istate)); \
                 klog_printf("  " cmd, ##__VA_ARGS__); \
-                task_kill(TASK->taskid); \
+                task_kill(task->taskid); \
                 thread_exit(); \
         } \

kernel/generic/src/printf/printf_core.c

@@ -419 +419 @@
  * TYPE:@n
  *      - "hh"  Signed or unsigned char.@n
- *      - "h"   Signed or usigned short.@n
- *      - ""    Signed or usigned int (default value).@n
- *      - "l"   Signed or usigned long int.@n
- *      - "ll"  Signed or usigned long long int.@n
+ *      - "h"   Signed or unsigned short.@n
+ *      - ""    Signed or unsigned int (default value).@n
+ *      - "l"   Signed or unsigned long int.@n
+ *      - "ll"  Signed or unsigned long long int.@n
  *      - "z"   unative_t (non-standard extension).@n
  * 
@@ -434 +434 @@
  * 
  *      - P, p  Print value of a pointer. Void * value is expected and it is printed in hexadecimal notation with prefix
- *      (as with \%#X or \%#x for 32bit or \%#X / \%#x for 64bit long pointers).
+ *      (as with \%#X / \%#x for 32bit or \%#X / \%#x for 64bit long pointers).
  *
  *      - b     Print value as unsigned binary number. Prefix is not printed by default. (Nonstandard extension.)