<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>change log for rtems (2010-06-16)</title>
</head>
<body text='#000000' bgcolor='#ffffff'>
<a name='cs1'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>joel</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-06-16 Joel Sherrill <joel.sherrilL@OARcorp.com>
* cpu_asm.S: Use SYM macro to be consistent with other ports.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/cpu/bfin/ChangeLog.diff?r1=text&tr1=1.35&r2=text&tr2=1.36&diff_format=h">M</a></td><td width='1%'>1.36</td><td width='100%'>cpukit/score/cpu/bfin/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/cpu/bfin/cpu_asm.S.diff?r1=text&tr1=1.9&r2=text&tr2=1.10&diff_format=h">M</a></td><td width='1%'>1.10</td><td width='100%'>cpukit/score/cpu/bfin/cpu_asm.S</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/score/cpu/bfin/ChangeLog:1.35 rtems/cpukit/score/cpu/bfin/ChangeLog:1.36
--- rtems/cpukit/score/cpu/bfin/ChangeLog:1.35 Tue Apr 20 08:27:48 2010
+++ rtems/cpukit/score/cpu/bfin/ChangeLog Wed Jun 16 12:19:31 2010
</font><font color='#997700'>@@ -1,3 +1,7 @@
</font><font color='#000088'>+2010-06-16 Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+ * cpu_asm.S: Use SYM macro to be consistent with other ports.
+
</font> 2010-04-20 Allan Hessenflow <allanh@kallisti.com>
* cpu_asm.S: L0-L3 were part of the interrupt context, but as
<font color='#006600'>diff -u rtems/cpukit/score/cpu/bfin/cpu_asm.S:1.9 rtems/cpukit/score/cpu/bfin/cpu_asm.S:1.10
--- rtems/cpukit/score/cpu/bfin/cpu_asm.S:1.9 Tue Apr 20 08:27:48 2010
+++ rtems/cpukit/score/cpu/bfin/cpu_asm.S Wed Jun 16 12:19:31 2010
</font><font color='#997700'>@@ -35,8 +35,8 @@
</font>
#if 0
/* some debug routines */
<font color='#880000'>- .globl __CPU_write_char;
-__CPU_write_char:
</font><font color='#000088'>+ .globl SYM(_CPU_write_char);
+SYM(_CPU_write_char):
</font> p0.h = 0xffc0;
p0.l = 0x0400;
txWaitLoop:
<font color='#997700'>@@ -46,112 +46,112 @@
</font> w[p0 + 0x00] = r0;
rts;
<font color='#880000'>- .globl __CPU_write_crlf;
-__CPU_write_crlf:
</font><font color='#000088'>+ .globl SYM(_CPU_write_crlf);
+SYM(_CPU_write_crlf):
</font> r0 = '\r';
[--sp] = rets;
<font color='#880000'>- call __CPU_write_char;
</font><font color='#000088'>+ call SYM(_CPU_write_char);
</font> rets = [sp++];
r0 = '\n';
<font color='#880000'>- jump __CPU_write_char;
</font><font color='#000088'>+ jump SYM(_CPU_write_char);
</font>
<font color='#880000'>-__CPU_write_space:
</font><font color='#000088'>+SYM(_CPU_write_space):
</font> r0 = ' ';
<font color='#880000'>- jump __CPU_write_char;
</font><font color='#000088'>+ jump SYM(_CPU_write_char);
</font>
<font color='#880000'>- .globl __CPU_write_nybble;
-__CPU_write_nybble:
</font><font color='#000088'>+ .globl SYM(_CPU_write_nybble);
+SYM(_CPU_write_nybble:)
</font> r1 = 0x0f;
r0 = r0 & r1;
r0 += '0';
r1 = '9';
cc = r0 <= r1;
<font color='#880000'>- if cc jump __CPU_write_char;
</font><font color='#000088'>+ if cc jump SYM(_CPU_write_char);
</font> r0 += 'a' - '0' - 10;
<font color='#880000'>- jump __CPU_write_char;
</font><font color='#000088'>+ jump SYM(_CPU_write_char);
</font>
<font color='#880000'>- .globl __CPU_write_byte;
-__CPU_write_byte:
</font><font color='#000088'>+ .globl SYM(_CPU_write_byte);
+SYM(_CPU_write_byte):
</font> [--sp] = r0;
[--sp] = rets;
r0 >>= 4;
<font color='#880000'>- call __CPU_write_nybble;
</font><font color='#000088'>+ call SYM(_CPU_write_nybble);
</font> rets = [sp++];
r0 = [sp++];
<font color='#880000'>- jump __CPU_write_nybble;
</font><font color='#000088'>+ jump SYM(_CPU_write_nybble);
</font>
<font color='#880000'>-__CPU_write_chawmp:
</font><font color='#000088'>+SYM(_CPU_write_chawmp):
</font> [--sp] = r0;
[--sp] = rets;
r0 >>= 8;
<font color='#880000'>- call __CPU_write_byte;
</font><font color='#000088'>+ call SYM(_CPU_write_byte);
</font> rets = [sp++];
r0 = [sp++];
<font color='#880000'>- jump __CPU_write_byte;
</font><font color='#000088'>+ jump SYM(_CPU_write_byte);
</font>
<font color='#880000'>-__CPU_write_gawble:
</font><font color='#000088'>+SYM(_CPU_write_gawble):
</font> [--sp] = r0;
[--sp] = rets;
r0 >>= 16;
<font color='#880000'>- call __CPU_write_chawmp;
</font><font color='#000088'>+ call SYM(_CPU_write_chawmp);
</font> rets = [sp++];
r0 = [sp++];
<font color='#880000'>- jump __CPU_write_chawmp;
</font><font color='#000088'>+ jump SYM(_CPU_write_chawmp);
</font>
<font color='#880000'>-__CPU_dump_registers:
</font><font color='#000088'>+SYM(_CPU_dump_registers):
</font> [--sp] = rets;
[--sp] = r0;
[--sp] = r1;
[--sp] = p0;
r0 = [sp + 8];
<font color='#880000'>- call __CPU_write_gawble;
- call __CPU_write_space;
</font><font color='#000088'>+ call SYM(_CPU_write_gawble);
+ call SYM(_CPU_write_space);
</font> r0 = [sp + 4];
<font color='#880000'>- call __CPU_write_gawble;
- call __CPU_write_space;
</font><font color='#000088'>+ call SYM(_CPU_write_gawble);
+ call SYM(_CPU_write_space);
</font> r0 = r2;
<font color='#880000'>- call __CPU_write_gawble;
- call __CPU_write_space;
</font><font color='#000088'>+ call SYM(_CPU_write_gawble);
+ call SYM(_CPU_write_space);
</font> r0 = r3;
<font color='#880000'>- call __CPU_write_gawble;
- call __CPU_write_space;
</font><font color='#000088'>+ call SYM(_CPU_write_gawble);
+ call SYM(_CPU_write_space);
</font> r0 = r4;
<font color='#880000'>- call __CPU_write_gawble;
- call __CPU_write_space;
</font><font color='#000088'>+ call SYM(_CPU_write_gawble);
+ call SYM(_CPU_write_space);
</font> r0 = r5;
<font color='#880000'>- call __CPU_write_gawble;
- call __CPU_write_space;
</font><font color='#000088'>+ call SYM(_CPU_write_gawble);
+ call SYM(_CPU_write_space);
</font> r0 = r6;
<font color='#880000'>- call __CPU_write_gawble;
- call __CPU_write_space;
</font><font color='#000088'>+ call SYM(_CPU_write_gawble);
+ call SYM(_CPU_write_space);
</font> r0 = r7;
<font color='#880000'>- call __CPU_write_gawble;
- call __CPU_write_crlf;
</font><font color='#000088'>+ call SYM(_CPU_write_gawble);
+ call SYM(_CPU_write_crlf);
</font> r0 = [sp];
<font color='#880000'>- call __CPU_write_gawble;
- call __CPU_write_space;
</font><font color='#000088'>+ call SYM(_CPU_write_gawble);
+ call SYM(_CPU_write_space);
</font> r0 = p1;
<font color='#880000'>- call __CPU_write_gawble;
- call __CPU_write_space;
</font><font color='#000088'>+ call SYM(_CPU_write_gawble);
+ call SYM(_CPU_write_space);
</font> r0 = p2;
<font color='#880000'>- call __CPU_write_gawble;
- call __CPU_write_space;
</font><font color='#000088'>+ call SYM(_CPU_write_gawble);
+ call SYM(_CPU_write_space);
</font> r0 = p3;
<font color='#880000'>- call __CPU_write_gawble;
- call __CPU_write_space;
</font><font color='#000088'>+ call SYM(_CPU_write_gawble);
+ call SYM(_CPU_write_space);
</font> r0 = p4;
<font color='#880000'>- call __CPU_write_gawble;
- call __CPU_write_space;
</font><font color='#000088'>+ call SYM(_CPU_write_gawble);
+ call SYM(_CPU_write_space);
</font> r0 = p5;
<font color='#880000'>- call __CPU_write_gawble;
- call __CPU_write_space;
</font><font color='#000088'>+ call SYM(_CPU_write_gawble);
+ call SYM(_CPU_write_space);
</font> r0 = fp;
<font color='#880000'>- call __CPU_write_gawble;
- call __CPU_write_space;
</font><font color='#000088'>+ call SYM(_CPU_write_gawble);
+ call SYM(_CPU_write_space);
</font> r0 = sp;
r0 += 16;
<font color='#880000'>- call __CPU_write_gawble;
- call __CPU_write_crlf;
</font><font color='#000088'>+ call SYM(_CPU_write_gawble);
+ call SYM(_CPU_write_crlf);
</font>
p0 = [sp++];
r1 = [sp++];
<font color='#997700'>@@ -159,65 +159,65 @@
</font> rets = [sp++];
rts;
<font color='#880000'>- .globl __CPU_Exception_handler;
-__CPU_Exception_handler:
</font><font color='#000088'>+ .globl SYM(_CPU_Exception_handler);
+SYM(_CPU_Exception_handler):
</font> usp = sp;
sp.h = 0xffb0;
sp.l = 0x1000;
[--sp] = (r7:0,p5:0);
r0 = 'x';
<font color='#880000'>- call __CPU_write_char;
</font><font color='#000088'>+ call SYM(_CPU_write_char);
</font> jump hcf;
<font color='#880000'>- .globl __CPU_Emulation_handler;
-__CPU_Emulation_handler:
</font><font color='#000088'>+ .globl SYM(_CPU_Emulation_handler);
+SYM(_CPU_Emulation_handler):
</font> usp = sp;
sp.h = 0xffb0;
sp.l = 0x1000;
[--sp] = (r7:0,p5:0);
r0 = 'e';
<font color='#880000'>- call __CPU_write_char;
</font><font color='#000088'>+ call SYM(_CPU_write_char);
</font> jump hcf;
<font color='#880000'>- .globl __CPU_Reset_handler;
-__CPU_Reset_handler:
</font><font color='#000088'>+ .globl SYM(_CPU_Reset_handler);
+SYM(_CPU_Reset_handler):
</font> usp = sp;
sp.h = 0xffb0;
sp.l = 0x1000;
[--sp] = (r7:0,p5:0);
r0 = 'r';
<font color='#880000'>- call __CPU_write_char;
</font><font color='#000088'>+ call SYM(_CPU_write_char);
</font> jump hcf;
<font color='#880000'>- .globl __CPU_NMI_handler;
-__CPU_NMI_handler:
</font><font color='#000088'>+ .globl SYM(_CPU_NMI_handler);
+SYM(_CPU_NMI_handler):
</font> usp = sp;
sp.h = 0xffb0;
sp.l = 0x1000;
[--sp] = (r7:0,p5:0);
r0 = 'n';
<font color='#880000'>- call __CPU_write_char;
</font><font color='#000088'>+ call SYM(_CPU_write_char);
</font> jump hcf;
<font color='#880000'>- .globl __CPU_Unhandled_Interrupt_handler;
-__CPU_Unhandled_Interrupt_handler:
</font><font color='#000088'>+ .globl SYM(_CPU_Unhandled_Interrupt_handler);
+SYM(_CPU_Unhandled_Interrupt_handler):
</font> usp = sp;
sp.h = 0xffb0;
sp.l = 0x1000;
[--sp] = (r7:0,p5:0);
<font color='#880000'>- call __CPU_write_crlf;
</font><font color='#000088'>+ call SYM(_CPU_write_crlf);
</font> r0 = 'i';
<font color='#880000'>- call __CPU_write_char;
</font><font color='#000088'>+ call SYM(_CPU_write_char);
</font> p0.h = HI(IPEND);
p0.l = LO(IPEND);
r0 = [p0];
<font color='#880000'>- call __CPU_write_chawmp;
</font><font color='#000088'>+ call SYM(_CPU_write_chawmp);
</font> jump hcf;
hcf:
<font color='#997700'>@@ -239,8 +239,8 @@
</font>
/* make sure this sequence stays in sync with the definition for
Context_Control in rtems/score/cpu.h */
<font color='#880000'>- .globl __CPU_Context_switch
-__CPU_Context_switch:
</font><font color='#000088'>+ .globl SYM(_CPU_Context_switch)
+SYM(_CPU_Context_switch):
</font> /* Start saving context R0 = current, R1=heir */
p0 = r0;
[p0++] = r4;
<font color='#997700'>@@ -306,19 +306,19 @@
</font> * none
*
*/
<font color='#880000'>- .globl __CPU_Context_restore
-__CPU_Context_restore:
</font><font color='#000088'>+ .globl SYM(_CPU_Context_restore)
+SYM(_CPU_Context_restore):
</font> p0 = r0;
jump restore;
<font color='#880000'>- .globl __ISR_Handler
- .extern __CPU_Interrupt_stack_high;
- .extern __ISR_Nest_level
- .extern __Thread_Dispatch_disable_level
- .extern __Context_Switch_necessary
- .extern __ISR_Signals_to_thread_executing
-__ISR_Handler:
</font><font color='#000088'>+ .globl SYM(_ISR_Handler)
+ .extern SYM(_CPU_Interrupt_stack_high)
+ .extern SYM(_ISR_Nest_level)
+ .extern SYM(_Thread_Dispatch_disable_level)
+ .extern SYM(_Context_Switch_necessary)
+ .extern SYM(_ISR_Signals_to_thread_executing)
+SYM(_ISR_Handler):
</font> /* all interrupts are disabled at this point */
/* the following few items are pushed onto the task stack for at
most one interrupt; nested interrupts will be using the interrupt
<font color='#997700'>@@ -328,8 +328,8 @@
</font> [--sp] = p0;
[--sp] = r1;
[--sp] = r0;
<font color='#880000'>- p0.h = __ISR_Nest_level;
- p0.l = __ISR_Nest_level;
</font><font color='#000088'>+ p0.h = SYM(_ISR_Nest_level);
+ p0.l = SYM(_ISR_Nest_level);
</font> r0 = [p0];
r0 += 1;
[p0] = r0;
<font color='#997700'>@@ -337,14 +337,14 @@
</font> if !cc jump noStackSwitch;
/* setup interrupt stack */
r0 = sp;
<font color='#880000'>- p0.h = __CPU_Interrupt_stack_high;
- p0.l = __CPU_Interrupt_stack_high;
</font><font color='#000088'>+ p0.h = SYM(_CPU_Interrupt_stack_high);
+ p0.l = SYM(_CPU_Interrupt_stack_high);
</font> sp = [p0];
[--sp] = r0;
noStackSwitch:
/* disable thread dispatch */
<font color='#880000'>- p0.h = __Thread_Dispatch_disable_level;
- p0.l = __Thread_Dispatch_disable_level;
</font><font color='#000088'>+ p0.h = SYM(_Thread_Dispatch_disable_level);
+ p0.l = SYM(_Thread_Dispatch_disable_level);
</font> r0 = [p0];
r0 += 1;
[p0] = r0;
<font color='#997700'>@@ -365,8 +365,8 @@
</font> if !cc jump vectorIDLoop;
[--sp] = r2;
<font color='#880000'>- p0.h = __ISR_Vector_table;
- p0.l = __ISR_Vector_table;
</font><font color='#000088'>+ p0.h = SYM(_ISR_Vector_table);
+ p0.l = SYM(_ISR_Vector_table);
</font> r2 = [p0];
r1 = r0 << 2;
r1 = r1 + r2;
<font color='#997700'>@@ -452,8 +452,8 @@
</font> /* this disables interrupts again */
reti = [sp++];
<font color='#880000'>- p0.h = __ISR_Nest_level;
- p0.l = __ISR_Nest_level;
</font><font color='#000088'>+ p0.h = SYM(_ISR_Nest_level);
+ p0.l = SYM(_ISR_Nest_level);
</font> r0 = [p0];
r0 += -1;
[p0] = r0;
<font color='#997700'>@@ -464,8 +464,8 @@
</font>
/* check this stuff to ensure context_switch_necessary and
isr_signals_to_thread_executing are being handled appropriately. */
<font color='#880000'>- p0.h = __Thread_Dispatch_disable_level;
- p0.l = __Thread_Dispatch_disable_level;
</font><font color='#000088'>+ p0.h = SYM(_Thread_Dispatch_disable_level);
+ p0.l = SYM(_Thread_Dispatch_disable_level);
</font> r0 = [p0];
r0 += -1;
[p0] = r0;
<font color='#997700'>@@ -473,12 +473,12 @@
</font> if !cc jump noDispatch
/* do thread dispatch if necessary */
<font color='#880000'>- p0.h = __Context_Switch_necessary;
- p0.l = __Context_Switch_necessary;
</font><font color='#000088'>+ p0.h = SYM(_Context_Switch_necessary);
+ p0.l = SYM(_Context_Switch_necessary);
</font> r0 = B[p0] (Z);
cc = r0 == 0;
<font color='#880000'>- p0.h = __ISR_Signals_to_thread_executing;
- p0.l = __ISR_Signals_to_thread_executing;
</font><font color='#000088'>+ p0.h = SYM(_ISR_Signals_to_thread_executing);
+ p0.l = SYM(_ISR_Signals_to_thread_executing);
</font> if !cc jump doDispatch
r0 = B[p0] (Z);
cc = r0 == 0;
<font color='#997700'>@@ -502,9 +502,8 @@
</font> safely call _Thread_Dispatch, and do an "rti" to get back to the
original interrupted function. this does require self-nesting to be
enabled; the maximum nest depth is the number of tasks. */
<font color='#880000'>- .global __ISR15_Handler
- .extern __Thread_Dispatch
-__ISR15_Handler:
</font><font color='#000088'>+ .global SYM(_ISR15_Handler)
+SYM(_ISR15_Handler):
</font> [--sp] = reti;
[--sp] = rets;
[--sp] = astat;
<font color='#997700'>@@ -548,7 +547,7 @@
</font> l2 = r2;
l3 = r2;
sp += -12; /* bizarre abi... */
<font color='#880000'>- call __Thread_Dispatch;
</font><font color='#000088'>+ call SYM(_Thread_Dispatch);
</font> sp += 12;
b0 = [sp++];
b1 = [sp++];
</pre>
<p> </p>
<a name='cs2'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>joel</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-06-16 Joel Sherrill <joel.sherrill@oarcorp.com>
* cpu_asm.S: Remove trailing tabs.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/cpu/mips/ChangeLog.diff?r1=text&tr1=1.137&r2=text&tr2=1.138&diff_format=h">M</a></td><td width='1%'>1.138</td><td width='100%'>cpukit/score/cpu/mips/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/cpu/mips/cpu_asm.S.diff?r1=text&tr1=1.40&r2=text&tr2=1.41&diff_format=h">M</a></td><td width='1%'>1.41</td><td width='100%'>cpukit/score/cpu/mips/cpu_asm.S</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/score/cpu/mips/ChangeLog:1.137 rtems/cpukit/score/cpu/mips/ChangeLog:1.138
--- rtems/cpukit/score/cpu/mips/ChangeLog:1.137 Sun Apr 25 16:37:45 2010
+++ rtems/cpukit/score/cpu/mips/ChangeLog Wed Jun 16 12:25:53 2010
</font><font color='#997700'>@@ -1,3 +1,7 @@
</font><font color='#000088'>+2010-06-16 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * cpu_asm.S: Remove trailing tabs.
+
</font> 2010-04-25 Joel Sherrill <joel.sherrilL@OARcorp.com>
* cpu.c, rtems/score/cpu.h: Move _CPU_Context_Initialize() to cpu.c so
<font color='#006600'>diff -u rtems/cpukit/score/cpu/mips/cpu_asm.S:1.40 rtems/cpukit/score/cpu/mips/cpu_asm.S:1.41
--- rtems/cpukit/score/cpu/mips/cpu_asm.S:1.40 Sat Mar 27 10:02:15 2010
+++ rtems/cpukit/score/cpu/mips/cpu_asm.S Wed Jun 16 12:25:54 2010
</font><font color='#997700'>@@ -70,15 +70,15 @@
</font> #else
#endif
<font color='#880000'>-/*<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+/*
</font> #if ( CPU_HARDWARE_FP == TRUE )
#warning CPU_HARDWARE_FP == TRUE
#else
#warning CPU_HARDWARE_FP != TRUE
#endif
*/
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
+
</font> /* enable debugging shadow writes to misc ram, this is a vestigal
* Mongoose-ism debug tool- but may be handy in the future so we
* left it in...
<font color='#997700'>@@ -88,7 +88,7 @@
</font> /* #define INSTRUMENT_EXECUTING_THREAD */
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> /* Ifdefs prevent the duplication of code for MIPS ISA Level 3 ( R4xxx )
* and MIPS ISA Level 1 (R3xxx).
*/
<font color='#997700'>@@ -141,7 +141,7 @@
</font> #define ISR_VEC_SIZE 4
#define EXCP_STACK_SIZE (NREGS*R_SZ)
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> #ifdef __GNUC__
#define ASM_EXTERN(x,size) .extern x,size
#else
<font color='#997700'>@@ -198,11 +198,11 @@
</font> #define FP31_OFFSET 31
#define FPCS_OFFSET 32
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> ASM_EXTERN(__exceptionStackFrame, SZ_INT)
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
+
</font> /*
* _CPU_Context_save_fp_context
*
<font color='#997700'>@@ -232,7 +232,7 @@
</font> ** integer task is switching out with a FP task switching in.
*/
mfc0 t0,C0_SR
<font color='#880000'>- li t2,SR_CU1<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+ li t2,SR_CU1
</font> move t1,t0
or t0,t2 /* turn on the fpu */
#if (__mips == 3) || (__mips == 32)
<font color='#997700'>@@ -241,21 +241,21 @@
</font> li t2,SR_IEC
#endif
not t2
<font color='#880000'>- and t0,t2 /* turn off interrupts */<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+ and t0,t2 /* turn off interrupts */
</font> mtc0 t0,C0_SR
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> lw a1,(a0) /* get address of context storage area */
move t0,ra
jal _CPU_Context_save_fp_from_exception
NOP
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> /*
** Reassert the task's state because we've not saved it yet.
*/
mtc0 t1,C0_SR
j t0
NOP
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> .globl _CPU_Context_save_fp_from_exception
_CPU_Context_save_fp_from_exception:
STREGC1 $f0,FP0_OFFSET*F_SZ(a1)
<font color='#997700'>@@ -324,14 +324,14 @@
</font> FRAME(_CPU_Context_restore_fp,sp,0,ra)
.set noat
.set noreorder
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> /*
** Make sure the FPU is on before we retrieve state. This code
** is here because the FPU context switch might occur when an
** integer task is switching out with a FP task switching in.
*/
mfc0 t0,C0_SR
<font color='#880000'>- li t2,SR_CU1<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+ li t2,SR_CU1
</font> move t1,t0
or t0,t2 /* turn on the fpu */
#if (__mips == 3) || (__mips == 32)
<font color='#997700'>@@ -340,9 +340,9 @@
</font> li t2,SR_IEC
#endif
not t2
<font color='#880000'>- and t0,t2 /* turn off interrupts */<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+ and t0,t2 /* turn off interrupts */
</font> mtc0 t0,C0_SR
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> lw a1,(a0) /* get address of context storage area */
move t0,ra
jal _CPU_Context_restore_fp_from_exception
<font color='#997700'>@@ -355,7 +355,7 @@
</font> mtc0 t1,C0_SR
j t0
NOP
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> .globl _CPU_Context_restore_fp_from_exception
_CPU_Context_restore_fp_from_exception:
LDREGC1 $f0,FP0_OFFSET*F_SZ(a1)
<font color='#997700'>@@ -442,7 +442,7 @@
</font> STREG s6,S6_OFFSET*R_SZ(a0)
STREG s7,S7_OFFSET*R_SZ(a0)
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> /*
** this code grabs the userspace EPC if we're dispatching from
** an interrupt frame or supplies the address of the dispatch
<font color='#997700'>@@ -453,7 +453,7 @@
</font> ** the interrupt handler and is cleared immediately when this
** routine gets it.
*/
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> la t0,__exceptionStackFrame /* see if we're coming in from an exception */
LDREG t1, (t0)
NOP
<font color='#997700'>@@ -464,11 +464,11 @@
</font> LDREG t0,R_EPC*R_SZ(t1) /* get the userspace EPC from the frame */
b 2f
NOP
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> 1: la t0,_Thread_Dispatch /* if ==0, we're switched out */
2: STREG t0,C0_EPC_OFFSET*R_SZ(a0)
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font>
_CPU_Context_switch_restore:
LDREG ra,RA_OFFSET*R_SZ(a1) /* restore context */
<font color='#997700'>@@ -484,7 +484,7 @@
</font> LDREG s7,S7_OFFSET*R_SZ(a1)
LDREG t0, C0_SR_OFFSET*R_SZ(a1)
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> /* NOP */
/*#if (__mips == 3) || (__mips == 32) */
/* andi t0,SR_EXL */
<font color='#997700'>@@ -550,20 +550,20 @@
</font> or t2,SR_IEC + SR_IEP + SR_IEO
#endif
and t0,t2 /* keep only the per-task bits */
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> mfc0 t1,C0_SR /* grab the current SR */
<font color='#880000'>- not t2<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+ not t2
</font> and t1,t2 /* mask off the old task's per-task bits */
or t1,t0 /* or in the new task's bits */
mtc0 t1,C0_SR /* and load the new SR */
NOP
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> /* _CPU_Context_1: */
j ra
NOP
ENDFRAME(_CPU_Context_switch)
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> /*
* _CPU_Context_restore
*
<font color='#997700'>@@ -585,18 +585,18 @@
</font>
ENDFRAME(_CPU_Context_restore)
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> ASM_EXTERN(_ISR_Nest_level,4)
ASM_EXTERN(_Thread_Dispatch_disable_level,4)
ASM_EXTERN(_Context_Switch_necessary,1)
ASM_EXTERN(_ISR_Signals_to_thread_executing,1)
ASM_EXTERN(_Thread_Executing,4)
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> .extern _Thread_Dispatch
.extern _ISR_Vector_table
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font>
/* void _DBG_Handler()
<font color='#997700'>@@ -621,7 +621,7 @@
</font>
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> /* void __ISR_Handler()
*
* This routine provides the RTEMS interrupt management.
<font color='#997700'>@@ -681,7 +681,7 @@
</font> STREG gp, R_GP*R_SZ(sp)
STREG t0, R_MDHI*R_SZ(sp)
STREG fp, R_FP*R_SZ(sp)
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> .set noat
STREG AT, R_AT*R_SZ(sp)
.set at
<font color='#997700'>@@ -720,7 +720,7 @@
</font> STREG t0,R_CAUSE*R_SZ(sp)
STREG sp, R_SP*R_SZ(sp)
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> STREG s0,R_S0*R_SZ(sp) /* save s0 - s7 */
STREG s1,R_S1*R_SZ(sp)
STREG s2,R_S2*R_SZ(sp)
<font color='#997700'>@@ -736,14 +736,14 @@
</font> mfc0 t0,C0_TAR
#endif
MFCO t1,C0_BADVADDR
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> #if __mips == 1
STREG t0,R_TAR*R_SZ(sp)
#else
NOP
#endif
STREG t1,R_BADVADDR*R_SZ(sp)
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> #if ( CPU_HARDWARE_FP == TRUE )
mfc0 t0,C0_SR /* FPU is enabled, save state */
NOP
<font color='#997700'>@@ -762,12 +762,12 @@
</font>
1:
#endif
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> move a0,sp
jal mips_vector_exceptions
NOP
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> /*
** Note, if the exception vector returns, rely on it to have
** adjusted EPC so we will return to some correct address. If
<font color='#997700'>@@ -781,7 +781,7 @@
</font> ** exception routine to properly adjust EPC, so the code below
** may be helpful for doing just that.
*/
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> /* *********************************************************************
** this code follows the R3000's exception return logic, but is not
** needed because the gdb stub does it for us. It might be useful
<font color='#997700'>@@ -797,13 +797,13 @@
</font> AND t4,t1,t3
beqz t4,excnodelay
NOP
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> * it did, now see if the branch occured or not *
li t3,CAUSE_BT
AND t4,t1,t3
beqz t4,excnobranch
NOP
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> * branch was taken, we resume at the branch target *
LDREG t0, R_TAR*R_SZ(sp)
j excreturn
<font color='#997700'>@@ -812,30 +812,30 @@
</font> excnobranch:
ADDU t0,R_SZ
<font color='#880000'>-excnodelay:<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+excnodelay:
</font> ADDU t0,R_SZ
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
-excreturn:<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
+excreturn:
</font> STREG t0, R_EPC*R_SZ(sp)
NOP
********************************************************************* */
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font>
/* if we're returning into mips_break, move to the next instruction */
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> LDREG t0,R_EPC*R_SZ(sp)
la t1,mips_break
xor t2,t0,t1
bnez t2,3f
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> addu t0,R_SZ
STREG t0,R_EPC*R_SZ(sp)
NOP
<font color='#880000'>-3:<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+3:
+
+
+
</font>
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
-<span style="background-color: #FF0000"> </span>
-<span style="background-color: #FF0000"> </span>
</font> #if ( CPU_HARDWARE_FP == TRUE )
mfc0 t0,C0_SR /* FPU is enabled, restore state */
NOP
<font color='#997700'>@@ -885,11 +885,11 @@
</font> /* external interrupt not enabled, ignore */
/* but if it's not an exception or an interrupt, */
/* Then where did it come from??? */
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> beq t0,zero,_ISR_Handler_exit
NOP
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> /*
* save some or all context on stack
* may need to save some special interrupt information for exit
<font color='#997700'>@@ -975,8 +975,8 @@
</font> beq t0,zero,_ISR_Handler_exit
NOP
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
+
</font> #ifdef INSTRUMENT_EXECUTING_THREAD
lw t0,_Thread_Executing
NOP
<font color='#997700'>@@ -992,12 +992,12 @@
</font>
mfc0 t0, C0_SR
#if __mips == 1
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> li t1,SR_IEC
or t0, t1
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> #elif (__mips == 3) || (__mips == 32)
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> /*
** clear XL and set IE so we can get interrupts.
*/
<font color='#997700'>@@ -1005,7 +1005,7 @@
</font> not t1
and t0,t1
or t0, SR_IE
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> #endif
mtc0 t0, C0_SR
NOP
<font color='#997700'>@@ -1013,7 +1013,7 @@
</font> /* save off our stack frame so the context switcher can get to it */
la t0,__exceptionStackFrame
STREG sp,(t0)
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> jal _Thread_Dispatch
NOP
<font color='#997700'>@@ -1034,7 +1034,7 @@
</font> #if __mips == 1
/* ints off, current & prev kernel mode on (kernel mode enabled is bit clear..argh!) */
<font color='#880000'>- li t1,SR_IEC | SR_KUP | SR_KUC<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+ li t1,SR_IEC | SR_KUP | SR_KUC
</font> not t1
and t0, t1
mtc0 t0, C0_SR
<font color='#997700'>@@ -1048,7 +1048,7 @@
</font> and t0,t1
mtc0 t0,C0_SR
NOP
<font color='#880000'>-<span style="background-color: #FF0000"><span style="background-color: #FF0000"> </span> </span>
</font><font color='#000088'>+<span style="background-color: #FF0000"> </span>
</font> /* apply task's SR with EXL set so the eret will return properly */
or t0, SR_EXL | SR_IE
mtc0 t0, C0_SR
<font color='#997700'>@@ -1059,7 +1059,7 @@
</font> NOP
MTCO t0, C0_EPC
NOP
<font color='#880000'>-<span style="background-color: #FF0000"><span style="background-color: #FF0000"> </span> </span>
</font><font color='#000088'>+<span style="background-color: #FF0000"> </span>
</font> #endif
<font color='#997700'>@@ -1073,7 +1073,7 @@
</font> sw t0,0x8001FFF8
#endif
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> /*
* prepare to get out of interrupt
* return from interrupt (maybe to _ISR_Dispatch)
<font color='#997700'>@@ -1091,7 +1091,7 @@
</font> **
*/
/* restore context from stack */
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> #ifdef INSTRUMENT_EXECUTING_THREAD
lw t0,_Thread_Executing
NOP
<font color='#997700'>@@ -1121,11 +1121,11 @@
</font> LDREG a3, R_A3*R_SZ(sp)
LDREG v1, R_V1*R_SZ(sp)
LDREG v0, R_V0*R_SZ(sp)
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> #if __mips == 1
LDREG k1, R_EPC*R_SZ(sp)
#endif
<font color='#880000'>-<span style="background-color: #FF0000"> </span>
</font><font color='#000088'>+
</font> .set noat
LDREG AT, R_AT*R_SZ(sp)
.set at
<font color='#997700'>@@ -1144,8 +1144,6 @@
</font> ENDFRAME(_ISR_Handler)
<font color='#880000'>-
-<span style="background-color: #FF0000"> </span>
</font> FRAME(mips_break,sp,0,ra)
.set noreorder
break 0x0 /* this statement must be first in this function, assumed so by mips-stub.c */
</pre>
<p> </p>
<a name='cs3'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>joel</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-06-16 Joel Sherrill <joel.sherrill@oarcorp.com>
* score/src/objectallocate.c: Add conditionally compiled debug code to
printk a message when an object allocation error occurs. This should
be helpful in identifying when a ported package required more
resources.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/ChangeLog.diff?r1=text&tr1=1.2402&r2=text&tr2=1.2403&diff_format=h">M</a></td><td width='1%'>1.2403</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/score/src/objectallocate.c.diff?r1=text&tr1=1.9&r2=text&tr2=1.10&diff_format=h">M</a></td><td width='1%'>1.10</td><td width='100%'>cpukit/score/src/objectallocate.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2402 rtems/cpukit/ChangeLog:1.2403
--- rtems/cpukit/ChangeLog:1.2402 Wed Jun 16 12:30:32 2010
+++ rtems/cpukit/ChangeLog Wed Jun 16 12:35:25 2010
</font><font color='#997700'>@@ -1,3 +1,10 @@
</font><font color='#000088'>+2010-06-16 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * score/src/objectallocate.c: Add conditionally compiled debug code to
+ printk a message when an object allocation error occurs. This should
+ be helpful in identifying when a ported package required more
+ resources.
+
</font> 2010-06-16 Ralf Corsépius <ralf.corsepius@rtems.org>
* libfs/src/rfs/rtems-rfs-inode.c: Various 64bit fixes.
<font color='#006600'>diff -u rtems/cpukit/score/src/objectallocate.c:1.9 rtems/cpukit/score/src/objectallocate.c:1.10
--- rtems/cpukit/score/src/objectallocate.c:1.9 Thu Oct 8 02:07:36 2009
+++ rtems/cpukit/score/src/objectallocate.c Wed Jun 16 12:35:25 2010
</font><font color='#997700'>@@ -28,6 +28,12 @@
</font> #include <rtems/score/sysstate.h>
#include <rtems/score/isr.h>
<font color='#000088'>+/* #define RTEMS_DEBUG_OBJECT_ALLOCATION */
+
+#if defined(RTEMS_DEBUG_OBJECT_ALLOCATION)
+#include <rtems/bspIo.h>
+#endif
+
</font> /*PAGE
*
* _Objects_Allocate
<font color='#997700'>@@ -82,5 +88,15 @@
</font> }
}
<font color='#000088'>+#if defined(RTEMS_DEBUG_OBJECT_ALLOCATION)
+ if ( !the_object ) {
+ printk(
+ "OBJECT ALLOCATION FAILURE! API/Class %d/%d\n",
+ information->the_api,
+ information->the_class
+ );
+ }
+#endif
+
</font> return the_object;
}
</pre>
<p> </p>
<a name='cs4'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ralf</strong></font>
<font color='#225522'><em>(on branch rtems-4-10-branch)</em></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-06-16 Ralf Corsépius <ralf.corsepius@rtems.org>
* libfs/src/rfs/rtems-rfs-rtems.c: Various 64bit fixes.
Add PRIomode_t.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/ChangeLog.diff?r1=text&tr1=1.2400&r2=text&tr2=1.2401&diff_format=h">M</a></td><td width='1%'>1.2401</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/ChangeLog.diff?r1=text&tr1=1.2346.2.22&r2=text&tr2=1.2346.2.23&diff_format=h">M</a></td><td width='1%'>1.2346.2.23</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems.c.diff?r1=text&tr1=1.9&r2=text&tr2=1.10&diff_format=h">M</a></td><td width='1%'>1.10</td><td width='100%'>cpukit/libfs/src/rfs/rtems-rfs-rtems.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems.c.diff?r1=text&tr1=1.9&r2=text&tr2=1.9.2.1&diff_format=h">M</a></td><td width='1%'>1.9.2.1</td><td width='100%'>cpukit/libfs/src/rfs/rtems-rfs-rtems.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2400 rtems/cpukit/ChangeLog:1.2401
--- rtems/cpukit/ChangeLog:1.2400 Wed Jun 16 11:59:42 2010
+++ rtems/cpukit/ChangeLog Wed Jun 16 12:25:35 2010
</font><font color='#997700'>@@ -1,5 +1,7 @@
</font> 2010-06-16 Ralf Corsépius <ralf.corsepius@rtems.org>
<font color='#000088'>+ * libfs/src/rfs/rtems-rfs-rtems.c: Various 64bit fixes.
+ Add PRIomode_t.
</font> * libfs/src/rfs/rtems-rfs-buffer-bdbuf.c:
Various 64bit fixes.
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2346.2.22 rtems/cpukit/ChangeLog:1.2346.2.23
--- rtems/cpukit/ChangeLog:1.2346.2.22 Wed Jun 16 12:00:06 2010
+++ rtems/cpukit/ChangeLog Wed Jun 16 12:25:51 2010
</font><font color='#997700'>@@ -1,5 +1,7 @@
</font> 2010-06-16 Ralf Corsépius <ralf.corsepius@rtems.org>
<font color='#000088'>+ * libfs/src/rfs/rtems-rfs-rtems.c: Various 64bit fixes.
+ Add PRIomode_t.
</font> * libfs/src/rfs/rtems-rfs-buffer-bdbuf.c:
Various 64bit fixes.
<font color='#006600'>diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems.c:1.9 rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems.c:1.10
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems.c:1.9 Mon May 31 08:56:37 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems.c Wed Jun 16 12:25:40 2010
</font><font color='#997700'>@@ -19,8 +19,17 @@
</font> #include "config.h"
#endif
<font color='#000088'>+#include <inttypes.h>
</font> #include <stdlib.h>
<font color='#000088'>+#if SIZEOF_MODE_T == 8
+#define PRIomode_t PRIo64
+#elif SIZEOF_MODE_T == 4
+#define PRIomode_t PRIo32
+#else
+#error "unsupport size of mode_t"
+#endif
+
</font> #include <rtems/rfs/rtems-rfs-file.h>
#include <rtems/rfs/rtems-rfs-dir.h>
#include <rtems/rfs/rtems-rfs-link.h>
<font color='#997700'>@@ -72,7 +81,7 @@
</font> int rc;
if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_EVAL_PATH))
<font color='#880000'>- printf ("rtems-rfs-rtems: eval-path: in: path:%s pathlen:%zi ino:%ld\n",
</font><font color='#000088'>+ printf ("rtems-rfs-rtems: eval-path: in: path:%s pathlen:%zi ino:%" PRId32 "\n",
</font> path, pathlen, ino);
/*
<font color='#997700'>@@ -179,7 +188,7 @@
</font> return rtems_rfs_rtems_error ("eval_path: read parent inode", rc);
}
if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_EVAL_PATH))
<font color='#880000'>- printf("rtems-rfs-rtems: eval-path: parent: ino:%ld\n", ino);
</font><font color='#000088'>+ printf("rtems-rfs-rtems: eval-path: parent: ino:%" PRId32 "\n", ino);
</font> }
else
{
<font color='#997700'>@@ -197,7 +206,7 @@
</font> return ((errno = rc) == 0) ? 0 : -1;
}<span style="background-color: #FF0000"> </span>
if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_EVAL_PATH))
<font color='#880000'>- printf("rtems-rfs-rtems: eval-path: down: path:%s ino:%ld\n", node, ino);
</font><font color='#000088'>+ printf("rtems-rfs-rtems: eval-path: down: path:%s ino:%" PRId32 "\n", node, ino);
</font> }
rc = rtems_rfs_inode_close (fs, &inode);
<font color='#997700'>@@ -218,7 +227,7 @@
</font> rtems_rfs_rtems_unlock (fs);
if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_EVAL_PATH))
<font color='#880000'>- printf("rtems-rfs-rtems: eval-path: ino:%ld\n", ino);
</font><font color='#000088'>+ printf("rtems-rfs-rtems: eval-path: ino:%" PRId32 "\n", ino);
</font>
return rc;
}
<font color='#997700'>@@ -250,7 +259,7 @@
</font> int rc;
if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_EVAL_FOR_MAKE))
<font color='#880000'>- printf ("rtems-rfs-rtems: eval-for-make: path:%s ino:%ld\n", path, ino);
</font><font color='#000088'>+ printf ("rtems-rfs-rtems: eval-for-make: path:%s ino:%" PRId32 "\n", path, ino);
</font>
*name = path + strlen (path);
<font color='#997700'>@@ -377,7 +386,7 @@
</font> return rtems_rfs_rtems_error ("eval_for_make: read parent inode", rc);
}
if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_EVAL_FOR_MAKE))
<font color='#880000'>- printf ("rtems-rfs-rtems: eval-for-make: parent: ino:%ld\n", ino);
</font><font color='#000088'>+ printf ("rtems-rfs-rtems: eval-for-make: parent: ino:%" PRId32 "\n", ino);
</font> }
else
{
<font color='#997700'>@@ -393,7 +402,7 @@
</font> return rtems_rfs_rtems_error ("eval_for_make: reading inode", rc);
}
if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_EVAL_FOR_MAKE))
<font color='#880000'>- printf("rtems-rfs-rtems: eval-for-make: down: path:%s ino:%ld\n",
</font><font color='#000088'>+ printf("rtems-rfs-rtems: eval-for-make: down: path:%s ino:%" PRId32 "\n",
</font> node, ino);
}
<font color='#997700'>@@ -448,7 +457,7 @@
</font> rc = rtems_rfs_rtems_set_handlers (pathloc, &inode) ? 0 : EIO;
if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_EVAL_FOR_MAKE))
<font color='#880000'>- printf("rtems-rfs-rtems: eval-for-make: parent ino:%ld name:%s\n",
</font><font color='#000088'>+ printf("rtems-rfs-rtems: eval-for-make: parent ino:%" PRId32 " name:%s\n",
</font> ino, *name);
rtems_rfs_inode_close (fs, &inode);
<font color='#997700'>@@ -477,7 +486,7 @@
</font> int rc;
if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_LINK))
<font color='#880000'>- printf ("rtems-rfs-rtems: link: in: parent:%ld target:%ld\n",
</font><font color='#000088'>+ printf ("rtems-rfs-rtems: link: in: parent:%" PRId32 " target:%" PRId32 "\n",
</font> parent, target);
rtems_rfs_rtems_lock (fs);
<font color='#997700'>@@ -515,7 +524,7 @@
</font> rtems_rfs_rtems_lock (fs);
if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_UNLINK))
<font color='#880000'>- printf("rtems-rfs-rtems: unlink: parent:%ld doff:%lu ino:%ld\n",
</font><font color='#000088'>+ printf("rtems-rfs-rtems: unlink: parent:%" PRId32 " doff:%" PRIu32 " ino:%" PRId32 "\n",
</font> parent, doff, ino);
rc = rtems_rfs_unlink (fs, parent, ino, doff, rtems_rfs_unlink_dir_denied);
<font color='#997700'>@@ -611,7 +620,7 @@
</font> int rc;
if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_CHOWN))
<font color='#880000'>- printf ("rtems-rfs-rtems: chown: in: ino:%ld uid:%d gid:%d\n",
</font><font color='#000088'>+ printf ("rtems-rfs-rtems: chown: in: ino:%" PRId32 " uid:%d gid:%d\n",
</font> ino, owner, group);
rtems_rfs_rtems_lock (fs);
<font color='#997700'>@@ -775,7 +784,7 @@
</font> int rc;
if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_READLINK))
<font color='#880000'>- printf ("rtems-rfs-rtems: readlink: in: ino:%ld\n", ino);
</font><font color='#000088'>+ printf ("rtems-rfs-rtems: readlink: in: ino:%" PRId32 "\n", ino);
</font>
rtems_rfs_rtems_lock (fs);
<font color='#997700'>@@ -812,8 +821,8 @@
</font> int rc;
if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_FCHMOD))
<font color='#880000'>- printf ("rtems-rfs-rtems: fchmod: in: ino:%ld mode:%06o\n",
- ino, (unsigned int) mode);
</font><font color='#000088'>+ printf ("rtems-rfs-rtems: fchmod: in: ino:%" PRId32 " mode:%06" PRIomode_t "\n",
+ ino, mode);
</font>
rtems_rfs_rtems_lock (fs);
<font color='#997700'>@@ -892,7 +901,7 @@
</font> int rc;
if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_STAT))
<font color='#880000'>- printf ("rtems-rfs-rtems: stat: in: ino:%ld\n", ino);
</font><font color='#000088'>+ printf ("rtems-rfs-rtems: stat: in: ino:%" PRId32 "\n", ino);
</font>
rtems_rfs_rtems_lock (fs);
<font color='#997700'>@@ -1060,7 +1069,7 @@
</font> int rc;
if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_RMNOD))
<font color='#880000'>- printf ("rtems-rfs: rmnod: parent:%ld doff:%lu, ino:%ld\n",
</font><font color='#000088'>+ printf ("rtems-rfs: rmnod: parent:%" PRId32 " doff:%" PRIu32 ", ino:%" PRId32 "\n",
</font> parent, doff, ino);
rtems_rfs_rtems_lock (fs);
<font color='#997700'>@@ -1124,7 +1133,7 @@
</font> doff = rtems_rfs_rtems_get_pathloc_doff (old_loc);
if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_RENAME))
<font color='#880000'>- printf ("rtems-rfs: rename: ino:%ld doff:%lu, new parent:%ld new name:%s\n",
</font><font color='#000088'>+ printf ("rtems-rfs: rename: ino:%" PRId32 " doff:%" PRIu32 ", new parent:%" PRId32 " new name:%s\n",
</font> ino, doff, new_parent, new_name);
rtems_rfs_rtems_lock (fs);
<font color='#006600'>diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems.c:1.9 rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems.c:1.9.2.1
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems.c:1.9 Mon May 31 08:56:37 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-rtems.c Wed Jun 16 12:25:54 2010
</font><font color='#997700'>@@ -19,8 +19,17 @@
</font> #include "config.h"
#endif
<font color='#000088'>+#include <inttypes.h>
</font> #include <stdlib.h>
<font color='#000088'>+#if SIZEOF_MODE_T == 8
+#define PRIomode_t PRIo64
+#elif SIZEOF_MODE_T == 4
+#define PRIomode_t PRIo32
+#else
+#error "unsupport size of mode_t"
+#endif
+
</font> #include <rtems/rfs/rtems-rfs-file.h>
#include <rtems/rfs/rtems-rfs-dir.h>
#include <rtems/rfs/rtems-rfs-link.h>
<font color='#997700'>@@ -72,7 +81,7 @@
</font> int rc;
if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_EVAL_PATH))
<font color='#880000'>- printf ("rtems-rfs-rtems: eval-path: in: path:%s pathlen:%zi ino:%ld\n",
</font><font color='#000088'>+ printf ("rtems-rfs-rtems: eval-path: in: path:%s pathlen:%zi ino:%" PRId32 "\n",
</font> path, pathlen, ino);
/*
<font color='#997700'>@@ -179,7 +188,7 @@
</font> return rtems_rfs_rtems_error ("eval_path: read parent inode", rc);
}
if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_EVAL_PATH))
<font color='#880000'>- printf("rtems-rfs-rtems: eval-path: parent: ino:%ld\n", ino);
</font><font color='#000088'>+ printf("rtems-rfs-rtems: eval-path: parent: ino:%" PRId32 "\n", ino);
</font> }
else
{
<font color='#997700'>@@ -197,7 +206,7 @@
</font> return ((errno = rc) == 0) ? 0 : -1;
}<span style="background-color: #FF0000"> </span>
if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_EVAL_PATH))
<font color='#880000'>- printf("rtems-rfs-rtems: eval-path: down: path:%s ino:%ld\n", node, ino);
</font><font color='#000088'>+ printf("rtems-rfs-rtems: eval-path: down: path:%s ino:%" PRId32 "\n", node, ino);
</font> }
rc = rtems_rfs_inode_close (fs, &inode);
<font color='#997700'>@@ -218,7 +227,7 @@
</font> rtems_rfs_rtems_unlock (fs);
if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_EVAL_PATH))
<font color='#880000'>- printf("rtems-rfs-rtems: eval-path: ino:%ld\n", ino);
</font><font color='#000088'>+ printf("rtems-rfs-rtems: eval-path: ino:%" PRId32 "\n", ino);
</font>
return rc;
}
<font color='#997700'>@@ -250,7 +259,7 @@
</font> int rc;
if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_EVAL_FOR_MAKE))
<font color='#880000'>- printf ("rtems-rfs-rtems: eval-for-make: path:%s ino:%ld\n", path, ino);
</font><font color='#000088'>+ printf ("rtems-rfs-rtems: eval-for-make: path:%s ino:%" PRId32 "\n", path, ino);
</font>
*name = path + strlen (path);
<font color='#997700'>@@ -377,7 +386,7 @@
</font> return rtems_rfs_rtems_error ("eval_for_make: read parent inode", rc);
}
if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_EVAL_FOR_MAKE))
<font color='#880000'>- printf ("rtems-rfs-rtems: eval-for-make: parent: ino:%ld\n", ino);
</font><font color='#000088'>+ printf ("rtems-rfs-rtems: eval-for-make: parent: ino:%" PRId32 "\n", ino);
</font> }
else
{
<font color='#997700'>@@ -393,7 +402,7 @@
</font> return rtems_rfs_rtems_error ("eval_for_make: reading inode", rc);
}
if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_EVAL_FOR_MAKE))
<font color='#880000'>- printf("rtems-rfs-rtems: eval-for-make: down: path:%s ino:%ld\n",
</font><font color='#000088'>+ printf("rtems-rfs-rtems: eval-for-make: down: path:%s ino:%" PRId32 "\n",
</font> node, ino);
}
<font color='#997700'>@@ -448,7 +457,7 @@
</font> rc = rtems_rfs_rtems_set_handlers (pathloc, &inode) ? 0 : EIO;
if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_EVAL_FOR_MAKE))
<font color='#880000'>- printf("rtems-rfs-rtems: eval-for-make: parent ino:%ld name:%s\n",
</font><font color='#000088'>+ printf("rtems-rfs-rtems: eval-for-make: parent ino:%" PRId32 " name:%s\n",
</font> ino, *name);
rtems_rfs_inode_close (fs, &inode);
<font color='#997700'>@@ -477,7 +486,7 @@
</font> int rc;
if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_LINK))
<font color='#880000'>- printf ("rtems-rfs-rtems: link: in: parent:%ld target:%ld\n",
</font><font color='#000088'>+ printf ("rtems-rfs-rtems: link: in: parent:%" PRId32 " target:%" PRId32 "\n",
</font> parent, target);
rtems_rfs_rtems_lock (fs);
<font color='#997700'>@@ -515,7 +524,7 @@
</font> rtems_rfs_rtems_lock (fs);
if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_UNLINK))
<font color='#880000'>- printf("rtems-rfs-rtems: unlink: parent:%ld doff:%lu ino:%ld\n",
</font><font color='#000088'>+ printf("rtems-rfs-rtems: unlink: parent:%" PRId32 " doff:%" PRIu32 " ino:%" PRId32 "\n",
</font> parent, doff, ino);
rc = rtems_rfs_unlink (fs, parent, ino, doff, rtems_rfs_unlink_dir_denied);
<font color='#997700'>@@ -611,7 +620,7 @@
</font> int rc;
if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_CHOWN))
<font color='#880000'>- printf ("rtems-rfs-rtems: chown: in: ino:%ld uid:%d gid:%d\n",
</font><font color='#000088'>+ printf ("rtems-rfs-rtems: chown: in: ino:%" PRId32 " uid:%d gid:%d\n",
</font> ino, owner, group);
rtems_rfs_rtems_lock (fs);
<font color='#997700'>@@ -775,7 +784,7 @@
</font> int rc;
if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_READLINK))
<font color='#880000'>- printf ("rtems-rfs-rtems: readlink: in: ino:%ld\n", ino);
</font><font color='#000088'>+ printf ("rtems-rfs-rtems: readlink: in: ino:%" PRId32 "\n", ino);
</font>
rtems_rfs_rtems_lock (fs);
<font color='#997700'>@@ -812,8 +821,8 @@
</font> int rc;
if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_FCHMOD))
<font color='#880000'>- printf ("rtems-rfs-rtems: fchmod: in: ino:%ld mode:%06o\n",
- ino, (unsigned int) mode);
</font><font color='#000088'>+ printf ("rtems-rfs-rtems: fchmod: in: ino:%" PRId32 " mode:%06" PRIomode_t "\n",
+ ino, mode);
</font>
rtems_rfs_rtems_lock (fs);
<font color='#997700'>@@ -892,7 +901,7 @@
</font> int rc;
if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_STAT))
<font color='#880000'>- printf ("rtems-rfs-rtems: stat: in: ino:%ld\n", ino);
</font><font color='#000088'>+ printf ("rtems-rfs-rtems: stat: in: ino:%" PRId32 "\n", ino);
</font>
rtems_rfs_rtems_lock (fs);
<font color='#997700'>@@ -1060,7 +1069,7 @@
</font> int rc;
if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_RMNOD))
<font color='#880000'>- printf ("rtems-rfs: rmnod: parent:%ld doff:%lu, ino:%ld\n",
</font><font color='#000088'>+ printf ("rtems-rfs: rmnod: parent:%" PRId32 " doff:%" PRIu32 ", ino:%" PRId32 "\n",
</font> parent, doff, ino);
rtems_rfs_rtems_lock (fs);
<font color='#997700'>@@ -1124,7 +1133,7 @@
</font> doff = rtems_rfs_rtems_get_pathloc_doff (old_loc);
if (rtems_rfs_rtems_trace (RTEMS_RFS_RTEMS_DEBUG_RENAME))
<font color='#880000'>- printf ("rtems-rfs: rename: ino:%ld doff:%lu, new parent:%ld new name:%s\n",
</font><font color='#000088'>+ printf ("rtems-rfs: rename: ino:%" PRId32 " doff:%" PRIu32 ", new parent:%" PRId32 " new name:%s\n",
</font> ino, doff, new_parent, new_name);
rtems_rfs_rtems_lock (fs);
</pre>
<p> </p>
<a name='cs5'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ralf</strong></font>
<font color='#225522'><em>(on branch rtems-4-10-branch)</em></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-06-16 Ralf Corsépius <ralf.corsepius@rtems.org>
* libfs/src/rfs/rtems-rfs-inode.c: Various 64bit fixes.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/ChangeLog.diff?r1=text&tr1=1.2401&r2=text&tr2=1.2402&diff_format=h">M</a></td><td width='1%'>1.2402</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/ChangeLog.diff?r1=text&tr1=1.2346.2.23&r2=text&tr2=1.2346.2.24&diff_format=h">M</a></td><td width='1%'>1.2346.2.24</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libfs/src/rfs/rtems-rfs-inode.c.diff?r1=text&tr1=1.3&r2=text&tr2=1.4&diff_format=h">M</a></td><td width='1%'>1.4</td><td width='100%'>cpukit/libfs/src/rfs/rtems-rfs-inode.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libfs/src/rfs/rtems-rfs-inode.c.diff?r1=text&tr1=1.3&r2=text&tr2=1.3.2.1&diff_format=h">M</a></td><td width='1%'>1.3.2.1</td><td width='100%'>cpukit/libfs/src/rfs/rtems-rfs-inode.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2401 rtems/cpukit/ChangeLog:1.2402
--- rtems/cpukit/ChangeLog:1.2401 Wed Jun 16 12:25:35 2010
+++ rtems/cpukit/ChangeLog Wed Jun 16 12:30:32 2010
</font><font color='#997700'>@@ -1,5 +1,6 @@
</font> 2010-06-16 Ralf Corsépius <ralf.corsepius@rtems.org>
<font color='#000088'>+ * libfs/src/rfs/rtems-rfs-inode.c: Various 64bit fixes.
</font> * libfs/src/rfs/rtems-rfs-rtems.c: Various 64bit fixes.
Add PRIomode_t.
* libfs/src/rfs/rtems-rfs-buffer-bdbuf.c:
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2346.2.23 rtems/cpukit/ChangeLog:1.2346.2.24
--- rtems/cpukit/ChangeLog:1.2346.2.23 Wed Jun 16 12:25:51 2010
+++ rtems/cpukit/ChangeLog Wed Jun 16 12:30:47 2010
</font><font color='#997700'>@@ -1,5 +1,6 @@
</font> 2010-06-16 Ralf Corsépius <ralf.corsepius@rtems.org>
<font color='#000088'>+ * libfs/src/rfs/rtems-rfs-inode.c: Various 64bit fixes.
</font> * libfs/src/rfs/rtems-rfs-rtems.c: Various 64bit fixes.
Add PRIomode_t.
* libfs/src/rfs/rtems-rfs-buffer-bdbuf.c:
<font color='#006600'>diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-inode.c:1.3 rtems/cpukit/libfs/src/rfs/rtems-rfs-inode.c:1.4
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-inode.c:1.3 Fri Mar 26 23:04:40 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-inode.c Wed Jun 16 12:30:35 2010
</font><font color='#997700'>@@ -22,6 +22,8 @@
</font> #include "config.h"
#endif
<font color='#000088'>+#include <inttypes.h>
+
</font> #include <rtems/rfs/rtems-rfs-block.h>
#include <rtems/rfs/rtems-rfs-file-system.h>
#include <rtems/rfs/rtems-rfs-inode.h>
<font color='#997700'>@@ -60,7 +62,7 @@
</font> int rc;
if (rtems_rfs_trace (RTEMS_RFS_TRACE_INODE_OPEN))
<font color='#880000'>- printf ("rtems-rfs: inode-open: ino: %lu\n", ino);
</font><font color='#000088'>+ printf ("rtems-rfs: inode-open: ino: %" PRIu32 "\n", ino);
</font>
if (ino == RTEMS_RFS_EMPTY_INO)
return EINVAL;
<font color='#997700'>@@ -93,7 +95,7 @@
</font> int rc;
if (rtems_rfs_trace (RTEMS_RFS_TRACE_INODE_CLOSE))
<font color='#880000'>- printf ("rtems-rfs: inode-close: ino: %lu\n", handle->ino);
</font><font color='#000088'>+ printf ("rtems-rfs: inode-close: ino: %" PRIu32 "\n", handle->ino);
</font>
rc = rtems_rfs_inode_unload (fs, handle, true);
<font color='#997700'>@@ -114,7 +116,7 @@
</font> rtems_rfs_inode_handle* handle)
{
if (rtems_rfs_trace (RTEMS_RFS_TRACE_INODE_LOAD))
<font color='#880000'>- printf ("rtems-rfs: inode-load: ino=%lu loads=%i loaded=%s\n",
</font><font color='#000088'>+ printf ("rtems-rfs: inode-load: ino=%" PRIu32 " loads=%i loaded=%s\n",
</font> handle->ino, handle->loads,
rtems_rfs_inode_is_loaded (handle) ? "yes" : "no");
<font color='#997700'>@@ -148,7 +150,7 @@
</font> int rc = 0;
if (rtems_rfs_trace (RTEMS_RFS_TRACE_INODE_UNLOAD))
<font color='#880000'>- printf ("rtems-rfs: inode-unload: ino=%lu loads=%i loaded=%s\n",
</font><font color='#000088'>+ printf ("rtems-rfs: inode-unload: ino=%" PRIu32 " loads=%i loaded=%s\n",
</font> handle->ino, handle->loads,
rtems_rfs_inode_is_loaded (handle) ? "yes" : "no");
<font color='#997700'>@@ -203,7 +205,7 @@
</font> type = "file";
else if (RTEMS_RFS_S_ISLNK (mode))
type = "link";
<font color='#880000'>- printf("rtems-rfs: inode-create: parent:%lu name:", parent);
</font><font color='#000088'>+ printf("rtems-rfs: inode-create: parent:%" PRIu32 " name:", parent);
</font> for (c = 0; c < length; c++)
printf ("%c", name[c]);
printf (" type:%s mode:%04x (%03o)\n", type, mode, mode & ((1 << 10) - 1));
<font color='#006600'>diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-inode.c:1.3 rtems/cpukit/libfs/src/rfs/rtems-rfs-inode.c:1.3.2.1
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-inode.c:1.3 Fri Mar 26 23:04:40 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-inode.c Wed Jun 16 12:30:51 2010
</font><font color='#997700'>@@ -22,6 +22,8 @@
</font> #include "config.h"
#endif
<font color='#000088'>+#include <inttypes.h>
+
</font> #include <rtems/rfs/rtems-rfs-block.h>
#include <rtems/rfs/rtems-rfs-file-system.h>
#include <rtems/rfs/rtems-rfs-inode.h>
<font color='#997700'>@@ -60,7 +62,7 @@
</font> int rc;
if (rtems_rfs_trace (RTEMS_RFS_TRACE_INODE_OPEN))
<font color='#880000'>- printf ("rtems-rfs: inode-open: ino: %lu\n", ino);
</font><font color='#000088'>+ printf ("rtems-rfs: inode-open: ino: %" PRIu32 "\n", ino);
</font>
if (ino == RTEMS_RFS_EMPTY_INO)
return EINVAL;
<font color='#997700'>@@ -93,7 +95,7 @@
</font> int rc;
if (rtems_rfs_trace (RTEMS_RFS_TRACE_INODE_CLOSE))
<font color='#880000'>- printf ("rtems-rfs: inode-close: ino: %lu\n", handle->ino);
</font><font color='#000088'>+ printf ("rtems-rfs: inode-close: ino: %" PRIu32 "\n", handle->ino);
</font>
rc = rtems_rfs_inode_unload (fs, handle, true);
<font color='#997700'>@@ -114,7 +116,7 @@
</font> rtems_rfs_inode_handle* handle)
{
if (rtems_rfs_trace (RTEMS_RFS_TRACE_INODE_LOAD))
<font color='#880000'>- printf ("rtems-rfs: inode-load: ino=%lu loads=%i loaded=%s\n",
</font><font color='#000088'>+ printf ("rtems-rfs: inode-load: ino=%" PRIu32 " loads=%i loaded=%s\n",
</font> handle->ino, handle->loads,
rtems_rfs_inode_is_loaded (handle) ? "yes" : "no");
<font color='#997700'>@@ -148,7 +150,7 @@
</font> int rc = 0;
if (rtems_rfs_trace (RTEMS_RFS_TRACE_INODE_UNLOAD))
<font color='#880000'>- printf ("rtems-rfs: inode-unload: ino=%lu loads=%i loaded=%s\n",
</font><font color='#000088'>+ printf ("rtems-rfs: inode-unload: ino=%" PRIu32 " loads=%i loaded=%s\n",
</font> handle->ino, handle->loads,
rtems_rfs_inode_is_loaded (handle) ? "yes" : "no");
<font color='#997700'>@@ -203,7 +205,7 @@
</font> type = "file";
else if (RTEMS_RFS_S_ISLNK (mode))
type = "link";
<font color='#880000'>- printf("rtems-rfs: inode-create: parent:%lu name:", parent);
</font><font color='#000088'>+ printf("rtems-rfs: inode-create: parent:%" PRIu32 " name:", parent);
</font> for (c = 0; c < length; c++)
printf ("%c", name[c]);
printf (" type:%s mode:%04x (%03o)\n", type, mode, mode & ((1 << 10) - 1));
</pre>
<p> </p>
<a name='cs6'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ralf</strong></font>
<font color='#225522'><em>(on branch rtems-4-10-branch)</em></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-06-16 Ralf Corsépius <ralf.corsepius@rtems.org>
* libfs/src/rfs/rtems-rfs-file.c: Various 64bit fixes.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/ChangeLog.diff?r1=text&tr1=1.2403&r2=text&tr2=1.2404&diff_format=h">M</a></td><td width='1%'>1.2404</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/ChangeLog.diff?r1=text&tr1=1.2346.2.24&r2=text&tr2=1.2346.2.25&diff_format=h">M</a></td><td width='1%'>1.2346.2.25</td><td width='100%'>cpukit/ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libfs/src/rfs/rtems-rfs-file.c.diff?r1=text&tr1=1.4&r2=text&tr2=1.5&diff_format=h">M</a></td><td width='1%'>1.5</td><td width='100%'>cpukit/libfs/src/rfs/rtems-rfs-file.c</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems/cpukit/libfs/src/rfs/rtems-rfs-file.c.diff?r1=text&tr1=1.4&r2=text&tr2=1.4.2.1&diff_format=h">M</a></td><td width='1%'>1.4.2.1</td><td width='100%'>cpukit/libfs/src/rfs/rtems-rfs-file.c</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2403 rtems/cpukit/ChangeLog:1.2404
--- rtems/cpukit/ChangeLog:1.2403 Wed Jun 16 12:35:25 2010
+++ rtems/cpukit/ChangeLog Wed Jun 16 12:44:37 2010
</font><font color='#997700'>@@ -1,3 +1,7 @@
</font><font color='#000088'>+2010-06-16 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * libfs/src/rfs/rtems-rfs-file.c: Various 64bit fixes.
+
</font> 2010-06-16 Joel Sherrill <joel.sherrill@oarcorp.com>
* score/src/objectallocate.c: Add conditionally compiled debug code to
<font color='#006600'>diff -u rtems/cpukit/ChangeLog:1.2346.2.24 rtems/cpukit/ChangeLog:1.2346.2.25
--- rtems/cpukit/ChangeLog:1.2346.2.24 Wed Jun 16 12:30:47 2010
+++ rtems/cpukit/ChangeLog Wed Jun 16 12:43:56 2010
</font><font color='#997700'>@@ -1,5 +1,6 @@
</font> 2010-06-16 Ralf Corsépius <ralf.corsepius@rtems.org>
<font color='#000088'>+ * libfs/src/rfs/rtems-rfs-file.c: Various 64bit fixes.
</font> * libfs/src/rfs/rtems-rfs-inode.c: Various 64bit fixes.
* libfs/src/rfs/rtems-rfs-rtems.c: Various 64bit fixes.
Add PRIomode_t.
<font color='#006600'>diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-file.c:1.4 rtems/cpukit/libfs/src/rfs/rtems-rfs-file.c:1.5
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-file.c:1.4 Fri Mar 26 23:04:40 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-file.c Wed Jun 16 12:44:37 2010
</font><font color='#997700'>@@ -21,6 +21,8 @@
</font> #include "config.h"
#endif
<font color='#000088'>+#include <inttypes.h>
+
</font> #include <rtems/rfs/rtems-rfs-block-pos.h>
#include <rtems/rfs/rtems-rfs-file.h>
#include <rtems/rfs/rtems-rfs-file-system.h>
<font color='#997700'>@@ -37,7 +39,7 @@
</font> int rc;
if (rtems_rfs_trace (RTEMS_RFS_TRACE_FILE_OPEN))
<font color='#880000'>- printf ("rtems-rfs: file-open: ino=%ld\n", ino);
</font><font color='#000088'>+ printf ("rtems-rfs: file-open: ino=%" PRId32 "\n", ino);
</font>
*file = NULL;
<font color='#997700'>@@ -71,7 +73,7 @@
</font> {
shared->references++;
if (rtems_rfs_trace (RTEMS_RFS_TRACE_FILE_OPEN))
<font color='#880000'>- printf ("rtems-rfs: file-open: ino=%ld shared\n", ino);
</font><font color='#000088'>+ printf ("rtems-rfs: file-open: ino=%" PRId32 " shared\n", ino);
</font> }
else
{
<font color='#997700'>@@ -127,7 +129,7 @@
</font> rtems_rfs_inode_unload (fs, &shared->inode, false);
if (rtems_rfs_trace (RTEMS_RFS_TRACE_FILE_OPEN))
<font color='#880000'>- printf ("rtems-rfs: file-open: ino=%ld share created\n", ino);
</font><font color='#000088'>+ printf ("rtems-rfs: file-open: ino=%" PRId32 " share created\n", ino);
</font> }
handle->flags = flags;
<font color='#997700'>@@ -148,7 +150,7 @@
</font> rrc = 0;
if (rtems_rfs_trace (RTEMS_RFS_TRACE_FILE_CLOSE))
<font color='#880000'>- printf ("rtems-rfs: file-close: entry: ino=%ld\n",
</font><font color='#000088'>+ printf ("rtems-rfs: file-close: entry: ino=%" PRId32 "\n",
</font> handle->shared->inode.ino);
if (handle->shared->references > 0)
<font color='#997700'>@@ -172,7 +174,7 @@
</font> if (rc > 0)
{
if (rtems_rfs_trace (RTEMS_RFS_TRACE_FILE_CLOSE))
<font color='#880000'>- printf ("rtems-rfs: file-close: map close error: ino=%ld: %d: %s\n",
</font><font color='#000088'>+ printf ("rtems-rfs: file-close: map close error: ino=%" PRId32 ": %d: %s\n",
</font> handle->shared->inode.ino, rc, strerror (rc));
if (rrc == 0)
rrc = rc;
<font color='#997700'>@@ -182,7 +184,7 @@
</font> if (rc > 0)
{
if (rtems_rfs_trace (RTEMS_RFS_TRACE_FILE_CLOSE))
<font color='#880000'>- printf ("rtems-rfs: file-close: inode close error: ino=%ld: %d: %s\n",
</font><font color='#000088'>+ printf ("rtems-rfs: file-close: inode close error: ino=%" PRId32 ": %d: %s\n",
</font> handle->shared->inode.ino, rc, strerror (rc));
if (rrc == 0)
rrc = rc;
<font color='#997700'>@@ -215,7 +217,7 @@
</font> size_t size;
if (rtems_rfs_trace (RTEMS_RFS_TRACE_FILE_IO))
<font color='#880000'>- printf ("rtems-rfs: file-io: start: %s pos=%lu:%lu\n",
</font><font color='#000088'>+ printf ("rtems-rfs: file-io: start: %s pos=%" PRIu32 ":%" PRIu32 "\n",
</font> read ? "read" : "write", handle->bpos.bno, handle->bpos.boff);
if (!rtems_rfs_buffer_handle_has_block (&handle->buffer))
<font color='#997700'>@@ -269,7 +271,7 @@
</font> }
if (rtems_rfs_trace (RTEMS_RFS_TRACE_FILE_IO))
<font color='#880000'>- printf ("rtems-rfs: file-io: start: block=%lu request-read=%s\n",
</font><font color='#000088'>+ printf ("rtems-rfs: file-io: start: block=%" PRIu32 " request-read=%s\n",
</font> block, request_read ? "yes" : "no");
rc = rtems_rfs_buffer_handle_request (rtems_rfs_file_fs (handle),
<font color='#997700'>@@ -360,7 +362,7 @@
</font> length = rtems_rfs_file_update_length (handle) && length;
if (rtems_rfs_trace (RTEMS_RFS_TRACE_FILE_IO))
<font color='#880000'>- printf ("rtems-rfs: file-io: end: pos=%lu:%lu %c %c %c\n",
</font><font color='#000088'>+ printf ("rtems-rfs: file-io: end: pos=%" PRIu32 ":%" PRIu32 " %c %c %c\n",
</font> handle->bpos.bno, handle->bpos.boff,
atime ? 'A' : '-', mtime ? 'M' : '-', length ? 'L' : '-');
<font color='#997700'>@@ -399,7 +401,7 @@
</font> rtems_rfs_pos* new_pos)
{
if (rtems_rfs_trace (RTEMS_RFS_TRACE_FILE_IO))
<font color='#880000'>- printf ("rtems-rfs: file-seek: new=%Lu\n", pos);
</font><font color='#000088'>+ printf ("rtems-rfs: file-seek: new=%" PRIu64 "\n", pos);
</font>
/*
* This call only sets the position if it is in a valid part of the file. The
<font color='#997700'>@@ -429,7 +431,7 @@
</font> int rc;
if (rtems_rfs_trace (RTEMS_RFS_TRACE_FILE_IO))
<font color='#880000'>- printf ("rtems-rfs: file-set-size: size=%Lu\n", new_size);
</font><font color='#000088'>+ printf ("rtems-rfs: file-set-size: size=%" PRIu64 "\n", new_size);
</font>
/*
* Short cut for the common truncate on open call.
<font color='#006600'>diff -u rtems/cpukit/libfs/src/rfs/rtems-rfs-file.c:1.4 rtems/cpukit/libfs/src/rfs/rtems-rfs-file.c:1.4.2.1
--- rtems/cpukit/libfs/src/rfs/rtems-rfs-file.c:1.4 Fri Mar 26 23:04:40 2010
+++ rtems/cpukit/libfs/src/rfs/rtems-rfs-file.c Wed Jun 16 12:43:57 2010
</font><font color='#997700'>@@ -21,6 +21,8 @@
</font> #include "config.h"
#endif
<font color='#000088'>+#include <inttypes.h>
+
</font> #include <rtems/rfs/rtems-rfs-block-pos.h>
#include <rtems/rfs/rtems-rfs-file.h>
#include <rtems/rfs/rtems-rfs-file-system.h>
<font color='#997700'>@@ -37,7 +39,7 @@
</font> int rc;
if (rtems_rfs_trace (RTEMS_RFS_TRACE_FILE_OPEN))
<font color='#880000'>- printf ("rtems-rfs: file-open: ino=%ld\n", ino);
</font><font color='#000088'>+ printf ("rtems-rfs: file-open: ino=%" PRId32 "\n", ino);
</font>
*file = NULL;
<font color='#997700'>@@ -71,7 +73,7 @@
</font> {
shared->references++;
if (rtems_rfs_trace (RTEMS_RFS_TRACE_FILE_OPEN))
<font color='#880000'>- printf ("rtems-rfs: file-open: ino=%ld shared\n", ino);
</font><font color='#000088'>+ printf ("rtems-rfs: file-open: ino=%" PRId32 " shared\n", ino);
</font> }
else
{
<font color='#997700'>@@ -127,7 +129,7 @@
</font> rtems_rfs_inode_unload (fs, &shared->inode, false);
if (rtems_rfs_trace (RTEMS_RFS_TRACE_FILE_OPEN))
<font color='#880000'>- printf ("rtems-rfs: file-open: ino=%ld share created\n", ino);
</font><font color='#000088'>+ printf ("rtems-rfs: file-open: ino=%" PRId32 " share created\n", ino);
</font> }
handle->flags = flags;
<font color='#997700'>@@ -148,7 +150,7 @@
</font> rrc = 0;
if (rtems_rfs_trace (RTEMS_RFS_TRACE_FILE_CLOSE))
<font color='#880000'>- printf ("rtems-rfs: file-close: entry: ino=%ld\n",
</font><font color='#000088'>+ printf ("rtems-rfs: file-close: entry: ino=%" PRId32 "\n",
</font> handle->shared->inode.ino);
if (handle->shared->references > 0)
<font color='#997700'>@@ -172,7 +174,7 @@
</font> if (rc > 0)
{
if (rtems_rfs_trace (RTEMS_RFS_TRACE_FILE_CLOSE))
<font color='#880000'>- printf ("rtems-rfs: file-close: map close error: ino=%ld: %d: %s\n",
</font><font color='#000088'>+ printf ("rtems-rfs: file-close: map close error: ino=%" PRId32 ": %d: %s\n",
</font> handle->shared->inode.ino, rc, strerror (rc));
if (rrc == 0)
rrc = rc;
<font color='#997700'>@@ -182,7 +184,7 @@
</font> if (rc > 0)
{
if (rtems_rfs_trace (RTEMS_RFS_TRACE_FILE_CLOSE))
<font color='#880000'>- printf ("rtems-rfs: file-close: inode close error: ino=%ld: %d: %s\n",
</font><font color='#000088'>+ printf ("rtems-rfs: file-close: inode close error: ino=%" PRId32 ": %d: %s\n",
</font> handle->shared->inode.ino, rc, strerror (rc));
if (rrc == 0)
rrc = rc;
<font color='#997700'>@@ -215,7 +217,7 @@
</font> size_t size;
if (rtems_rfs_trace (RTEMS_RFS_TRACE_FILE_IO))
<font color='#880000'>- printf ("rtems-rfs: file-io: start: %s pos=%lu:%lu\n",
</font><font color='#000088'>+ printf ("rtems-rfs: file-io: start: %s pos=%" PRIu32 ":%" PRIu32 "\n",
</font> read ? "read" : "write", handle->bpos.bno, handle->bpos.boff);
if (!rtems_rfs_buffer_handle_has_block (&handle->buffer))
<font color='#997700'>@@ -269,7 +271,7 @@
</font> }
if (rtems_rfs_trace (RTEMS_RFS_TRACE_FILE_IO))
<font color='#880000'>- printf ("rtems-rfs: file-io: start: block=%lu request-read=%s\n",
</font><font color='#000088'>+ printf ("rtems-rfs: file-io: start: block=%" PRIu32 " request-read=%s\n",
</font> block, request_read ? "yes" : "no");
rc = rtems_rfs_buffer_handle_request (rtems_rfs_file_fs (handle),
<font color='#997700'>@@ -360,7 +362,7 @@
</font> length = rtems_rfs_file_update_length (handle) && length;
if (rtems_rfs_trace (RTEMS_RFS_TRACE_FILE_IO))
<font color='#880000'>- printf ("rtems-rfs: file-io: end: pos=%lu:%lu %c %c %c\n",
</font><font color='#000088'>+ printf ("rtems-rfs: file-io: end: pos=%" PRIu32 ":%" PRIu32 " %c %c %c\n",
</font> handle->bpos.bno, handle->bpos.boff,
atime ? 'A' : '-', mtime ? 'M' : '-', length ? 'L' : '-');
<font color='#997700'>@@ -399,7 +401,7 @@
</font> rtems_rfs_pos* new_pos)
{
if (rtems_rfs_trace (RTEMS_RFS_TRACE_FILE_IO))
<font color='#880000'>- printf ("rtems-rfs: file-seek: new=%Lu\n", pos);
</font><font color='#000088'>+ printf ("rtems-rfs: file-seek: new=%" PRIu64 "\n", pos);
</font>
/*
* This call only sets the position if it is in a valid part of the file. The
<font color='#997700'>@@ -429,7 +431,7 @@
</font> int rc;
if (rtems_rfs_trace (RTEMS_RFS_TRACE_FILE_IO))
<font color='#880000'>- printf ("rtems-rfs: file-set-size: size=%Lu\n", new_size);
</font><font color='#000088'>+ printf ("rtems-rfs: file-set-size: size=%" PRIu64 "\n", new_size);
</font>
/*
* Short cut for the common truncate on open call.
</pre>
<p> </p>
<p>--<br />
<small>Generated by <a href="http://www.codewiz.org/projects/index.html#loginfo">Deluxe Loginfo</a> 2.122 by Bernardo Innocenti <bernie@develer.com></small></p>
</body>
</html>