MIPS: no exit() calls

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

diff --git a/src/target/mips32.c b/src/target/mips32.c
index fe22dd57a4331eafd7af823af8d4a13d55d6a51f..1315744cca3e86d4c9a142c578f1d6bad6de7003 100644 (file)
--- a/src/target/mips32.c
+++ b/src/target/mips32.c
@@ -27,6 +27,7 @@
 #endif
 
 #include "mips32.h"
+#include "register.h"
 
 
 char* mips32_core_reg_list[] =
@@ -90,7 +91,13 @@ uint8_t mips32_gdb_dummy_fp_value[] = {0, 0, 0, 0};
 
 struct reg mips32_gdb_dummy_fp_reg =
 {
-       "GDB dummy floating-point register", mips32_gdb_dummy_fp_value, 0, 1, 32, NULL, 0, NULL, 0
+       .name = "GDB dummy floating-point register",
+       .value = mips32_gdb_dummy_fp_value,
+       .dirty = 0,
+       .valid = 1,
+       .size = 32,
+       .arch_info = NULL,
+       .arch_type = 0,
 };
 
 int mips32_core_reg_arch_type = -1;
@@ -261,7 +268,7 @@ int mips32_arch_state(struct target *target)
        if (mips32->common_magic != MIPS32_COMMON_MAGIC)
        {
                LOG_ERROR("BUG: called for a non-MIPS32 target");
-               exit(-1);
+               return ERROR_FAIL;
        }
 
        LOG_USER("target halted due to %s, pc: 0x%8.8" PRIx32 "",
@@ -306,8 +313,6 @@ struct reg_cache *mips32_build_reg_cache(struct target *target)
                reg_list[i].value = calloc(1, 4);
                reg_list[i].dirty = 0;
                reg_list[i].valid = 0;
-               reg_list[i].bitfield_desc = NULL;
-               reg_list[i].num_bitfields = 0;
                reg_list[i].arch_type = mips32_core_reg_arch_type;
                reg_list[i].arch_info = &arch_info[i];
        }