projects / fw / openocd / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- Fixes '=' whitespace
[fw/openocd] / src / target / mips32_pracc.c
diff --git a/src/target/mips32_pracc.c b/src/target/mips32_pracc.c
index 59a9fb027594a06811e73921fa00a531dab6d2e3..b727e12ae4b987cdf9b68b062edb9e37ade48b13 100644 (file)
--- a/src/target/mips32_pracc.c
+++ b/src/target/mips32_pracc.c
@@ -143,7 +143,7 @@ static int mips32_pracc_exec_read(mips32_pracc_context *ctx, uint32_t address)
                 * to start of debug vector */
                
                data = 0;
-               LOG_ERROR("Error reading unexpected address %8.8x", address);
+               LOG_ERROR("Error reading unexpected address %8.8" PRIx32 "", address);
                return ERROR_JTAG_DEVICE_ERROR;
        }
        
@@ -200,7 +200,7 @@ static int mips32_pracc_exec_write(mips32_pracc_context *ctx, uint32_t address)
        }
        else
        {
-               LOG_ERROR("Error writing unexpected address %8.8x", address);
+               LOG_ERROR("Error writing unexpected address %8.8" PRIx32 "", address);
                return ERROR_JTAG_DEVICE_ERROR;
        }
        
@@ -278,7 +278,7 @@ int mips32_pracc_read_mem(mips_ejtag_t *ejtag_info, uint32_t addr, int size, int
                case 2:
                        return mips32_pracc_read_mem16(ejtag_info, addr, count, (uint16_t*)buf);
                case 4:
-                       if(count==1)
+                       if (count == 1)
                                return mips32_pracc_read_u32(ejtag_info, addr, (uint32_t*)buf);
                        else
                                return mips32_pracc_read_mem32(ejtag_info, addr, count, (uint32_t*)buf);
@@ -301,9 +301,9 @@ int mips32_pracc_read_mem32(mips_ejtag_t *ejtag_info, uint32_t addr, int count,
                        
                MIPS32_LUI(8,UPPER16(MIPS32_PRACC_PARAM_IN)),           /* $8 = MIPS32_PRACC_PARAM_IN */
                MIPS32_ORI(8,8,LOWER16(MIPS32_PRACC_PARAM_IN)),
-               MIPS32_LW(9,0,8),                                                                       /* $9=mem[$8]; read addr */
-               MIPS32_LW(10,4,8),                                                                      /* $10=mem[$8+4]; read count */
-               MIPS32_LUI(11,UPPER16(MIPS32_PRACC_PARAM_OUT)),         /* $11=MIPS32_PRACC_PARAM_OUT */
+               MIPS32_LW(9,0,8),                                                                       /* $9 = mem[$8]; read addr */
+               MIPS32_LW(10,4,8),                                                                      /* $10 = mem[$8+4]; read count */
+               MIPS32_LUI(11,UPPER16(MIPS32_PRACC_PARAM_OUT)),         /* $11 = MIPS32_PRACC_PARAM_OUT */
                MIPS32_ORI(11,11,LOWER16(MIPS32_PRACC_PARAM_OUT)),
                MIPS32_NOP,
                                                                                                                        /* loop: */
@@ -314,8 +314,8 @@ int mips32_pracc_read_mem32(mips_ejtag_t *ejtag_info, uint32_t addr, int count,
                MIPS32_SW(8,0,11),                                                                      /* sw $8,0($11) */
                
                MIPS32_ADDI(10,10,NEG16(1)),                                            /* $10-- */
-               MIPS32_ADDI(9,9,4),                                                             /* $1+=4 */
-               MIPS32_ADDI(11,11,4),                                                           /* $11+=4 */
+               MIPS32_ADDI(9,9,4),                                                             /* $1 += 4 */
+               MIPS32_ADDI(11,11,4),                                                           /* $11 += 4 */
                
                MIPS32_NOP,
                MIPS32_B(NEG16(9)),                                                                     /* b loop */
@@ -409,9 +409,9 @@ int mips32_pracc_read_mem16(mips_ejtag_t *ejtag_info, uint32_t addr, int count,
                        
                MIPS32_LUI(8,UPPER16(MIPS32_PRACC_PARAM_IN)),           /* $8 = MIPS32_PRACC_PARAM_IN */
                MIPS32_ORI(8,8,LOWER16(MIPS32_PRACC_PARAM_IN)),
-               MIPS32_LW(9,0,8),                                                                       /* $9=mem[$8]; read addr */
-               MIPS32_LW(10,4,8),                                                                      /* $10=mem[$8+4]; read count */
-               MIPS32_LUI(11,UPPER16(MIPS32_PRACC_PARAM_OUT)),         /* $11=MIPS32_PRACC_PARAM_OUT */
+               MIPS32_LW(9,0,8),                                                                       /* $9 = mem[$8]; read addr */
+               MIPS32_LW(10,4,8),                                                                      /* $10 = mem[$8+4]; read count */
+               MIPS32_LUI(11,UPPER16(MIPS32_PRACC_PARAM_OUT)),         /* $11 = MIPS32_PRACC_PARAM_OUT */
                MIPS32_ORI(11,11,LOWER16(MIPS32_PRACC_PARAM_OUT)),
                MIPS32_NOP,
                                                                                                                        /* loop: */
@@ -422,8 +422,8 @@ int mips32_pracc_read_mem16(mips_ejtag_t *ejtag_info, uint32_t addr, int count,
                MIPS32_SW(8,0,11),                                                                      /* sw $8,0($11) */
                
                MIPS32_ADDI(10,10,NEG16(1)),                                            /* $10-- */
-               MIPS32_ADDI(9,9,2),                                                             /* $9+=2 */
-               MIPS32_ADDI(11,11,4),                                                           /* $11+=4 */
+               MIPS32_ADDI(9,9,2),                                                             /* $9 += 2 */
+               MIPS32_ADDI(11,11,4),                                                           /* $11 += 4 */
                MIPS32_NOP,
                MIPS32_B(NEG16(9)),                                                                     /* b loop */
                MIPS32_NOP,
@@ -488,9 +488,9 @@ int mips32_pracc_read_mem8(mips_ejtag_t *ejtag_info, uint32_t addr, int count, u
                        
                MIPS32_LUI(8,UPPER16(MIPS32_PRACC_PARAM_IN)),           /* $8 = MIPS32_PRACC_PARAM_IN */
                MIPS32_ORI(8,8,LOWER16(MIPS32_PRACC_PARAM_IN)),
-               MIPS32_LW(9,0,8),                                                                       /* $9=mem[$8]; read addr */
-               MIPS32_LW(10,4,8),                                                                      /* $10=mem[$8+4]; read count */
-               MIPS32_LUI(11,UPPER16(MIPS32_PRACC_PARAM_OUT)),         /* $11=MIPS32_PRACC_PARAM_OUT */
+               MIPS32_LW(9,0,8),                                                                       /* $9 = mem[$8]; read addr */
+               MIPS32_LW(10,4,8),                                                                      /* $10 = mem[$8+4]; read count */
+               MIPS32_LUI(11,UPPER16(MIPS32_PRACC_PARAM_OUT)),         /* $11 = MIPS32_PRACC_PARAM_OUT */
                MIPS32_ORI(11,11,LOWER16(MIPS32_PRACC_PARAM_OUT)),
                MIPS32_NOP,
                                                                                                                        /* loop: */
@@ -501,8 +501,8 @@ int mips32_pracc_read_mem8(mips_ejtag_t *ejtag_info, uint32_t addr, int count, u
                MIPS32_SW(8,0,11),                                                                      /* sw $8,0($11) */
                
                MIPS32_ADDI(10,10,NEG16(1)),                                            /* $10-- */
-               MIPS32_ADDI(9,9,1),                                                             /* $9+=1 */
-               MIPS32_ADDI(11,11,4),                                                           /* $11+=4 */
+               MIPS32_ADDI(9,9,1),                                                             /* $9 += 1 */
+               MIPS32_ADDI(11,11,4),                                                           /* $11 += 4 */
                MIPS32_NOP,
                MIPS32_B(NEG16(9)),                                                                     /* b loop */
                MIPS32_NOP,
@@ -562,7 +562,7 @@ int mips32_pracc_write_mem(mips_ejtag_t *ejtag_info, uint32_t addr, int size, in
                case 2:
                        return mips32_pracc_write_mem16(ejtag_info, addr, count,(uint16_t*)buf);
                case 4:
-                       if(count==1)
+                       if (count == 1)
                                return mips32_pracc_write_u32(ejtag_info, addr, (uint32_t*)buf);
                        else
                                return mips32_pracc_write_mem32(ejtag_info, addr, count, (uint32_t*)buf);
@@ -588,15 +588,15 @@ int mips32_pracc_write_mem32(mips_ejtag_t *ejtag_info, uint32_t addr, int count,
                MIPS32_ADDI(8,15,NEG16(MIPS32_PRACC_STACK-MIPS32_PRACC_PARAM_IN)),  //$8= MIPS32_PRACC_PARAM_IN
                MIPS32_LW(9,0,8),                                                                       /* Load write addr to $9 */
                MIPS32_LW(10,4,8),      //last address                                                                  /* Load write count to $10 */
-               MIPS32_ADDI(8,8,8),     // $8+=8 beginning of data
+               MIPS32_ADDI(8,8,8),     // $8 += 8 beginning of data
 
 //loop:
                MIPS32_LW(11,0,8),                                                                      /* lw $11,0($8), Load $11 with the word @mem[$8] */
                MIPS32_SW(11,0,9),                                                                      /* sw $11,0($9) */
                
-               MIPS32_ADDI(9,9,4),                                                             /* $9+=4 */
+               MIPS32_ADDI(9,9,4),                                                             /* $9 += 4 */
                MIPS32_BNE(10,9,NEG16(4)),  //was 9 BNE $10, 9, loop                                                                    /* b loop */
-               MIPS32_ADDI(8,8,4),  //this instruction is part of the loop (one delay slot)!   /* $8+=4 */
+               MIPS32_ADDI(8,8,4),  //this instruction is part of the loop (one delay slot)!   /* $8 += 4 */
                                                                                                                        /* end: */
                MIPS32_LW(11,0,15),                                                             /* lw $11,($15) */
                MIPS32_LW(10,0,15),                                                             /* lw $10,($15) */
@@ -669,7 +669,7 @@ int mips32_pracc_write_mem16(mips_ejtag_t *ejtag_info, uint32_t addr, int count,
                MIPS32_ORI(8,8,LOWER16(MIPS32_PRACC_PARAM_IN)),
                MIPS32_LW(9,0,8),                                                                       /* Load write addr to $9 */
                MIPS32_LW(10,4,8),                                                                      /* Load write count to $10 */
-               MIPS32_ADDI(8,8,8),                                                             /* $8+=8 */
+               MIPS32_ADDI(8,8,8),                                                             /* $8 += 8 */
                MIPS32_NOP,
                                                                                                                        /* loop: */
                MIPS32_BEQ(0,10,9),                                                                     /* beq $0, $10, end */
@@ -679,8 +679,8 @@ int mips32_pracc_write_mem16(mips_ejtag_t *ejtag_info, uint32_t addr, int count,
                MIPS32_SH(11,0,9),                                                                      /* sh $11,0($9) */
                
                MIPS32_ADDI(10,10,NEG16(1)),                                            /* $10-- */
-               MIPS32_ADDI(9,9,2),                                                             /* $9+=2 */
-               MIPS32_ADDI(8,8,4),                                                             /* $8+=4 */
+               MIPS32_ADDI(9,9,2),                                                             /* $9 += 2 */
+               MIPS32_ADDI(8,8,4),                                                             /* $8 += 4 */
                
                MIPS32_NOP,
                MIPS32_B(NEG16(9)),                                                                     /* b loop */
@@ -729,7 +729,7 @@ int mips32_pracc_write_mem8(mips_ejtag_t *ejtag_info, uint32_t addr, int count,
                MIPS32_ORI(8,8,LOWER16(MIPS32_PRACC_PARAM_IN)),
                MIPS32_LW(9,0,8),                                                                       /* Load write addr to $9 */
                MIPS32_LW(10,4,8),                                                                      /* Load write count to $10 */
-               MIPS32_ADDI(8,8,8),                                                             /* $8+=8 */
+               MIPS32_ADDI(8,8,8),                                                             /* $8 += 8 */
                MIPS32_NOP,
                                                                                                                        /* loop: */
                MIPS32_BEQ(0,10,9),                                                                     /* beq $0, $10, end */
@@ -739,8 +739,8 @@ int mips32_pracc_write_mem8(mips_ejtag_t *ejtag_info, uint32_t addr, int count,
                MIPS32_SB(11,0,9),                                                                      /* sb $11,0($9) */
                
                MIPS32_ADDI(10,10,NEG16(1)),                                            /* $10-- */
-               MIPS32_ADDI(9,9,1),                                                             /* $9+=1 */
-               MIPS32_ADDI(8,8,4),                                                             /* $8+=4 */
+               MIPS32_ADDI(9,9,1),                                                             /* $9 += 1 */
+               MIPS32_ADDI(8,8,4),                                                             /* $8 += 4 */
                
                MIPS32_NOP,
                MIPS32_B(NEG16(9)),                                                                     /* b loop */
openocd with support for Altus Metrum targets