summaryrefslogtreecommitdiff
path: root/src/helper/jim.c
diff options
context:
space:
mode:
authorzwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-06-23 22:45:15 +0000
committerzwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-06-23 22:45:15 +0000
commitfb1a9b2cb2f844a17d26dfeb3d26849364d93e26 (patch)
tree70153522e64c9302588460cc670119055d9610ce /src/helper/jim.c
parent8959de9f679cfd0436d731fd91b88a68b9a75fa6 (diff)
downloadopenocd+libswd-fb1a9b2cb2f844a17d26dfeb3d26849364d93e26.tar.gz
openocd+libswd-fb1a9b2cb2f844a17d26dfeb3d26849364d93e26.tar.bz2
openocd+libswd-fb1a9b2cb2f844a17d26dfeb3d26849364d93e26.tar.xz
openocd+libswd-fb1a9b2cb2f844a17d26dfeb3d26849364d93e26.zip
- Fixes '[|]' whitespace
- Replace ')\([|]\)(' with ') \1 ('. - Replace ')\([|]\)\(\w\)' with ') \1 \2'. - Replace '\(\w\)\([|]\)(' with '\1 \2 ('. - Replace '\(\w\)\([|]\)\(\w\)' with '\1 \2 \3'. git-svn-id: svn://svn.berlios.de/openocd/trunk@2374 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/helper/jim.c')
-rw-r--r--src/helper/jim.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/helper/jim.c b/src/helper/jim.c
index 1dbe4958..bd077d2a 100644
--- a/src/helper/jim.c
+++ b/src/helper/jim.c
@@ -6963,7 +6963,7 @@ int Jim_EvalExpression(Jim_Interp *interp, Jim_Obj *exprObjPtr,
case JIM_EXPROP_NUMNE: wC = wA != wB; break;
case JIM_EXPROP_BITAND: wC = wA&wB; break;
case JIM_EXPROP_BITXOR: wC = wA^wB; break;
- case JIM_EXPROP_BITOR: wC = wA|wB; break;
+ case JIM_EXPROP_BITOR: wC = wA | wB; break;
case JIM_EXPROP_POW: wC = JimPowWide(wA,wB); break;
case JIM_EXPROP_LOGICAND_LEFT:
if (wA == 0) {
@@ -6996,7 +6996,7 @@ int Jim_EvalExpression(Jim_Interp *interp, Jim_Obj *exprObjPtr,
wC = _rotl(uA,(unsigned long)wB);
#else
const unsigned int S = sizeof(unsigned long) * 8;
- wC = (unsigned long)((uA << wB)|(uA >> (S-wB)));
+ wC = (unsigned long)((uA << wB) | (uA >> (S-wB)));
#endif
break;
}
@@ -7006,7 +7006,7 @@ int Jim_EvalExpression(Jim_Interp *interp, Jim_Obj *exprObjPtr,
wC = _rotr(uA,(unsigned long)wB);
#else
const unsigned int S = sizeof(unsigned long) * 8;
- wC = (unsigned long)((uA >> wB)|(uA << (S-wB)));
+ wC = (unsigned long)((uA >> wB) | (uA << (S-wB)));
#endif
break;
}