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