tcl: [3/3] prepare for jimtcl 0.81 'expr' syntax change

[fw/openocd] / tcl / target / psoc4.cfg

diff --git a/tcl/target/psoc4.cfg b/tcl/target/psoc4.cfg
index b56828207984037576c628afc5bc1be010f8ec97..d4ee79ff2c9b1997c8113dd74b2bf4055a09a3ca 100644 (file)
--- a/tcl/target/psoc4.cfg
+++ b/tcl/target/psoc4.cfg
@@ -78,18 +78,18 @@ proc psoc4_get_family_id {} {
        if { $err } {
                return 0
        }
-       if { [expr $romtable_pid(0) & 0xffffff00 ]
-         || [expr $romtable_pid(1) & 0xffffff00 ]
-         || [expr $romtable_pid(2) & 0xffffff00 ] } {
+       if { [expr {$romtable_pid(0) & 0xffffff00 }]
+         || [expr {$romtable_pid(1) & 0xffffff00 }]
+         || [expr {$romtable_pid(2) & 0xffffff00 }] } {
                echo "Unexpected data in ROMTABLE"
                return 0
        }
-       set designer_id [expr (( $romtable_pid(1) & 0xf0 ) >> 4) | (( $romtable_pid(2) & 0xf ) << 4 ) ]
+       set designer_id [expr {(( $romtable_pid(1) & 0xf0 ) >> 4) | (( $romtable_pid(2) & 0xf ) << 4 ) }]
        if { $designer_id != 0xb4 } {
                echo [format "ROMTABLE Designer ID 0x%02x is not Cypress" $designer_id]
                return 0
        }
-       set family_id [expr ( $romtable_pid(0) & 0xff ) | (( $romtable_pid(1) & 0xf ) << 8 ) ]
+       set family_id [expr {( $romtable_pid(0) & 0xff ) | (( $romtable_pid(1) & 0xf ) << 8 ) }]
        return $family_id
 }
 
@@ -194,7 +194,7 @@ proc ocd_process_reset_inner { MODE } {
 
                # Set registers to reset vector values
                mem2array value 32 0 2
-               reg pc [expr $value(1) & 0xfffffffe ]
+               reg pc [expr {$value(1) & 0xfffffffe} ]
                reg msp $value(0)
 
                if { $PSOC4_TEST_MODE_WORKAROUND } {