target/hla_target: set cortex_m->common_magic

[openocd.git] / src / target / nds32_cmd.c

diff --git a/src/target/nds32_cmd.c b/src/target/nds32_cmd.c
index 3931707be888e595b3fe83df88cfee93e7f92885..69c28ac783d1af399a885dabc36bc7efd04b5487 100644 (file)
--- a/src/target/nds32_cmd.c
+++ b/src/target/nds32_cmd.c
@@ -575,10 +575,9 @@ COMMAND_HANDLER(handle_nds32_decode_command)
                read_addr = addr;
                i = 0;
                while (i < insn_count) {
-                       if (ERROR_OK != nds32_read_opcode(nds32, read_addr, &opcode))
+                       if (nds32_read_opcode(nds32, read_addr, &opcode) != ERROR_OK)
                                return ERROR_FAIL;
-                       if (ERROR_OK != nds32_evaluate_opcode(nds32, opcode,
-                                               read_addr, &instruction))
+                       if (nds32_evaluate_opcode(nds32, opcode, read_addr, &instruction) != ERROR_OK)
                                return ERROR_FAIL;
 
                        command_print(CMD, "%s", instruction.text);
@@ -594,9 +593,9 @@ COMMAND_HANDLER(handle_nds32_decode_command)
 
                COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], addr);
 
-               if (ERROR_OK != nds32_read_opcode(nds32, addr, &opcode))
+               if (nds32_read_opcode(nds32, addr, &opcode) != ERROR_OK)
                        return ERROR_FAIL;
-               if (ERROR_OK != nds32_evaluate_opcode(nds32, opcode, addr, &instruction))
+               if (nds32_evaluate_opcode(nds32, opcode, addr, &instruction) != ERROR_OK)
                        return ERROR_FAIL;
 
                command_print(CMD, "%s", instruction.text);
@@ -702,7 +701,7 @@ static int jim_nds32_bulk_write(Jim_Interp *interp, int argc, Jim_Obj * const *a
                return e;
 
        uint32_t *data = malloc(count * sizeof(uint32_t));
-       if (data == NULL)
+       if (!data)
                return JIM_ERR;
 
        jim_wide i;