Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
ARM: add comments re DAP assumptions
[openocd.git] / src / target / mips32_pracc.c
diff --git a/src/target/mips32_pracc.c b/src/target/mips32_pracc.c
index 4bd1da7d96244d82e526e9460dcb4e4be2d57605..26d5a6b7d9c2ce079ecb36caa8f4dccb56833649 100644 (file)
--- a/src/target/mips32_pracc.c
+++ b/src/target/mips32_pracc.c
@@ -319,9 +319,8 @@ int mips32_pracc_read_mem32(struct mips_ejtag *ejtag_info, uint32_t addr, int co
                MIPS32_LW(10,0,15),                                                             /* lw $10,($15) */
                MIPS32_LW(9,0,15),                                                                      /* lw $9,($15) */
                MIPS32_LW(8,0,15),                                                                      /* lw $8,($15) */
+               MIPS32_B(NEG16(27)),                                                            /* b start */
                MIPS32_MFC0(15,31,0),                                                           /* move COP0 DeSave to $15 */
-               MIPS32_B(NEG16(28)),                                                            /* b start */
-               MIPS32_NOP,
        };
 
        int retval = ERROR_OK;
@@ -422,9 +421,8 @@ int mips32_pracc_read_mem16(struct mips_ejtag *ejtag_info, uint32_t addr, int co
                MIPS32_LW(10,0,15),                                                             /* lw $10,($15) */
                MIPS32_LW(9,0,15),                                                                      /* lw $9,($15) */
                MIPS32_LW(8,0,15),                                                                      /* lw $8,($15) */
-               MIPS32_MFC0(15,31,0),                                                           /* move COP0 DeSave to $15 */
-               MIPS32_B(NEG16(28)),                                                            /* b start */
-               MIPS32_NOP,
+               MIPS32_B(NEG16(27)),                                                            /* b start */
+               MIPS32_MFC0(15,30,0),                                                           /* move COP0 DeSave to $15 */
        };
 
        /* TODO remove array */
@@ -500,9 +498,8 @@ int mips32_pracc_read_mem8(struct mips_ejtag *ejtag_info, uint32_t addr, int cou
                MIPS32_LW(10,0,15),                                                             /* lw $10,($15) */
                MIPS32_LW(9,0,15),                                                                      /* lw $9,($15) */
                MIPS32_LW(8,0,15),                                                                      /* lw $8,($15) */
+               MIPS32_B(NEG16(27)),                                                            /* b start */
                MIPS32_MFC0(15,31,0),                                                           /* move COP0 DeSave to $15 */
-               MIPS32_B(NEG16(28)),                                                            /* b start */
-               MIPS32_NOP,
        };
 
        /* TODO remove array */
@@ -677,9 +674,8 @@ int mips32_pracc_write_mem16(struct mips_ejtag *ejtag_info, uint32_t addr, int c
                MIPS32_LW(10,0,15),                                                             /* lw $10,($15) */
                MIPS32_LW(9,0,15),                                                                      /* lw $9,($15) */
                MIPS32_LW(8,0,15),                                                                      /* lw $8,($15) */
+               MIPS32_B(NEG16(26)),                                                            /* b start */
                MIPS32_MFC0(15,31,0),                                                           /* move COP0 DeSave to $15 */
-               MIPS32_B(NEG16(27)),                                                            /* b start */
-               MIPS32_NOP,
        };
 
        /* TODO remove array */
@@ -736,9 +732,8 @@ int mips32_pracc_write_mem8(struct mips_ejtag *ejtag_info, uint32_t addr, int co
                MIPS32_LW(10,0,15),                                                             /* lw $10,($15) */
                MIPS32_LW(9,0,15),                                                                      /* lw $9,($15) */
                MIPS32_LW(8,0,15),                                                                      /* lw $8,($15) */
+               MIPS32_B(NEG16(26)),                                                            /* b start */
                MIPS32_MFC0(15,31,0),                                                           /* move COP0 DeSave to $15 */
-               MIPS32_B(NEG16(27)),                                                            /* b start */
-               MIPS32_NOP,
        };
 
        /* TODO remove array */
@@ -819,9 +814,8 @@ int mips32_pracc_write_regs(struct mips_ejtag *ejtag_info, uint32_t *regs)
 
                MIPS32_LW(2,2*4,1),                                                     /* lw $2,2*4($1) */
                MIPS32_LW(1,0,15),                                                              /* lw $1,($15) */
+               MIPS32_B(NEG16(53)),                                                    /* b start */
                MIPS32_MFC0(15,31,0),                                                   /* move COP0 DeSave to $15 */
-               MIPS32_B(NEG16(54)),                                                    /* b start */
-               MIPS32_NOP,
        };
 
        int retval;
@@ -895,9 +889,8 @@ int mips32_pracc_read_regs(struct mips_ejtag *ejtag_info, uint32_t *regs)
 
                MIPS32_LW(2,0,15),                                                              /* lw $2,($15) */
                MIPS32_LW(1,0,15),                                                              /* lw $1,($15) */
+               MIPS32_B(NEG16(58)),                                                    /* b start */
                MIPS32_MFC0(15,31,0),                                                   /* move COP0 DeSave to $15 */
-               MIPS32_B(NEG16(59)),                                                    /* b start */
-               MIPS32_NOP,
        };
 
        int retval;
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)