[PATCH]: eb3ba1e3e6 target: aarch64: align armv8_read_reg() and armv8_read_reg32()

[gerrit]

This is an automated email from Gerrit.

"Antonio Borneo <borneo.anto...@gmail.com>" just uploaded a new patch set to 
Gerrit, which you can find at https://review.openocd.org/c/openocd/+/8266

-- gerrit

commit eb3ba1e3e67f134df1401f19246cd5e2526df53b
Author: Antonio Borneo <borneo.anto...@gmail.com>
Date:   Mon May 13 15:40:15 2024 +0200

    target: aarch64: align armv8_read_reg() and armv8_read_reg32()
    
    These functions are today always called with non-NULL parameter
    regval, so the actual check is not needed.
    Anyway, for any future code change, check the parameter at the
    entry of the functions and return error if it is not valid.
    Simplify the check to assign the result value and align the code
    of the two functions.
    
    Change-Id: Ie4d98063006d70d9e2bcfc00bc930133caf33515
    Signed-off-by: Antonio Borneo <borneo.anto...@gmail.com>

diff --git a/src/target/armv8.c b/src/target/armv8.c
index bf582ff801..8d97902f55 100644
--- a/src/target/armv8.c
+++ b/src/target/armv8.c
@@ -282,6 +282,9 @@ static int armv8_read_reg(struct armv8_common *armv8, int 
regnum, uint64_t *regv
        uint32_t value;
        uint64_t value_64;
 
+       if (!regval)
+               return ERROR_FAIL;
+
        switch (regnum) {
        case 0 ... 30:
                retval = dpm->instr_read_data_dcc_64(dpm,
@@ -361,10 +364,8 @@ static int armv8_read_reg(struct armv8_common *armv8, int 
regnum, uint64_t *regv
                break;
        }
 
-       if (retval == ERROR_OK && regval)
+       if (retval == ERROR_OK)
                *regval = value_64;
-       else
-               retval = ERROR_FAIL;
 
        return retval;
 }
@@ -512,6 +513,9 @@ static int armv8_read_reg32(struct armv8_common *armv8, int 
regnum, uint64_t *re
        uint32_t value = 0;
        int retval;
 
+       if (!regval)
+               return ERROR_FAIL;
+
        switch (regnum) {
        case ARMV8_R0 ... ARMV8_R14:
                /* return via DCC:  "MCR p14, 0, Rnum, c0, c5, 0" */
@@ -587,7 +591,7 @@ static int armv8_read_reg32(struct armv8_common *armv8, int 
regnum, uint64_t *re
                break;
        }
 
-       if (retval == ERROR_OK && regval)
+       if (retval == ERROR_OK)
                *regval = value;
 
        return retval;

--