This is an automated email from Gerrit.

Andreas Fritiofson (andreas.fritiof...@gmail.com) just uploaded a new patch set 
to Gerrit, which you can find at http://openocd.zylin.com/2475

-- gerrit

commit 1239a15c543bad9d1f2704f2ee21e58a0611b7a2
Author: Andreas Fritiofson <andreas.fritiof...@gmail.com>
Date:   Sun Jan 18 13:38:28 2015 +0100

    nds32: Merge the 32 and 64 bit register fields.
    
    Only one of them is used at a time and after the change to byte arrays
    their types are also the same.
    
    Change-Id: I456869a1737f4b4f5e8ecbfc1c63c49a75d21619
    Signed-off-by: Andreas Fritiofson <andreas.fritiof...@gmail.com>

diff --git a/src/target/nds32.c b/src/target/nds32.c
index 6cae2c1..b6c5f61 100644
--- a/src/target/nds32.c
+++ b/src/target/nds32.c
@@ -139,7 +139,7 @@ static int nds32_get_core_reg_64(struct reg *reg)
                return ERROR_OK;
 
        if (reg_arch_info->enable == false) {
-               buf_set_u64(reg_arch_info->value_64, 0, 64, 
NDS32_REGISTER_DISABLE);
+               buf_set_u64(reg_arch_info->value, 0, 64, 
NDS32_REGISTER_DISABLE);
                retval = ERROR_FAIL;
        } else {
                uint64_t val = 0;
@@ -149,7 +149,7 @@ static int nds32_get_core_reg_64(struct reg *reg)
                } else {
                        retval = aice_read_reg_64(aice, reg_arch_info->num, 
&val);
                }
-               buf_set_u64(reg_arch_info->value_64, 0, 64, val);
+               buf_set_u64(reg_arch_info->value, 0, 64, val);
        }
 
        if (retval == ERROR_OK) {
@@ -428,7 +428,7 @@ static struct reg_cache *nds32_build_reg_cache(struct 
target *target,
                reg_list[i].reg_data_type = calloc(sizeof(struct 
reg_data_type), 1);
 
                if (FD0 <= reg_arch_info[i].num && reg_arch_info[i].num <= 
FD31) {
-                       reg_list[i].value = reg_arch_info[i].value_64;
+                       reg_list[i].value = reg_arch_info[i].value;
                        reg_list[i].type = &nds32_reg_access_type_64;
 
                        reg_list[i].reg_data_type->type = REG_TYPE_IEEE_DOUBLE;
@@ -1552,7 +1552,7 @@ int nds32_restore_context(struct target *target)
 
                                reg_arch_info = reg->arch_info;
                                if (FD0 <= reg_arch_info->num && 
reg_arch_info->num <= FD31) {
-                                       uint64_t val = 
buf_get_u64(reg_arch_info->value_64, 0, 64);
+                                       uint64_t val = 
buf_get_u64(reg_arch_info->value, 0, 64);
                                        aice_write_reg_64(aice, 
reg_arch_info->num, val);
                                } else {
                                        uint32_t val = 
buf_get_u32(reg_arch_info->value, 0, 32);
diff --git a/src/target/nds32.h b/src/target/nds32.h
index caca11b..e4161e9 100644
--- a/src/target/nds32.h
+++ b/src/target/nds32.h
@@ -362,8 +362,7 @@ struct nds32 {
 
 struct nds32_reg {
        int32_t num;
-       uint8_t value[4];
-       uint8_t value_64[8];
+       uint8_t value[8];
        struct target *target;
        struct nds32 *nds32;
        bool enable;

-- 

------------------------------------------------------------------------------
New Year. New Location. New Benefits. New Data Center in Ashburn, VA.
GigeNET is offering a free month of service with a new server in Ashburn.
Choose from 2 high performing configs, both with 100TB of bandwidth.
Higher redundancy.Lower latency.Increased capacity.Completely compliant.
http://p.sf.net/sfu/gigenet
_______________________________________________
OpenOCD-devel mailing list
OpenOCD-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openocd-devel

Reply via email to