josh
/
Teacup_Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

func.sh: Replace perl eval() with hex() where appropriate.

This commit is contained in:
Ben Jackson 2011-03-05 22:12:10 -08:00 committed by Michael Moon
parent a01981ac70
commit 7198021f4a
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
func.sh
View File

@ -245,37 +245,37 @@ mendel_readsym() {
mendel_readsym_uint8() { mendel_readsym_uint8() {
local sym=$1 local sym=$1
local val=$(mendel_readsym $sym) local val=$(mendel_readsym $sym)
perl -e 'printf "%u\n", eval "0x".$ARGV[0]' $val perl -e 'printf "%u\n", hex "0x".$ARGV[0]' $val
} }
mendel_readsym_int8() { mendel_readsym_int8() {
local sym=$1 local sym=$1
local val=$(mendel_readsym $sym) local val=$(mendel_readsym $sym)
perl -e 'printf "%d\n", ((eval "0x".$ARGV[0]) & 0x7F) - (((eval "0x".$ARGV[0]) & 0x80)?0x80:0)' $val perl -e 'printf "%d\n", ((hex "0x".$ARGV[0]) & 0x7F) - (((hex "0x".$ARGV[0]) & 0x80)?0x80:0)' $val
} }
mendel_readsym_uint16() { mendel_readsym_uint16() {
local sym=$1 local sym=$1
local val=$(mendel_readsym $sym) local val=$(mendel_readsym $sym)
perl -e '$ARGV[0] =~ m#(..)(..)# && printf "%u\n", eval "0x$2$1"' $val perl -e '$ARGV[0] =~ m#(..)(..)# && printf "%u\n", hex "0x$2$1"' $val
} }
mendel_readsym_int16() { mendel_readsym_int16() {
local sym=$1 local sym=$1
local val=$(mendel_readsym $sym) local val=$(mendel_readsym $sym)
perl -e '$ARGV[0] =~ m#(..)(..)# && printf "%d\n", ((eval "0x$2$1") & 0x7FFF) - (((eval "0x$2$1") & 0x8000)?0x8000:0)' $val perl -e '$ARGV[0] =~ m#(..)(..)# && printf "%d\n", ((hex "0x$2$1") & 0x7FFF) - (((hex "0x$2$1") & 0x8000)?0x8000:0)' $val
} }
mendel_readsym_uint32() { mendel_readsym_uint32() {
local sym=$1 local sym=$1
local val=$(mendel_readsym $sym) local val=$(mendel_readsym $sym)
perl -e '$ARGV[0] =~ m#(..)(..)(..)(..)# && printf "%u\n", eval "0x$4$3$2$1"' $val perl -e '$ARGV[0] =~ m#(..)(..)(..)(..)# && printf "%u\n", hex "0x$4$3$2$1"' $val
} }
mendel_readsym_int32() { mendel_readsym_int32() {
local sym=$1 local sym=$1
local val=$(mendel_readsym $sym) local val=$(mendel_readsym $sym)
perl -e '$ARGV[0] =~ m#(..)(..)(..)(..)# && printf "%d\n", eval "0x$4$3$2$1"' $val perl -e '$ARGV[0] =~ m#(..)(..)(..)(..)# && printf "%d\n", hex "0x$4$3$2$1"' $val
} }
mendel_readsym_target() { mendel_readsym_target() {
@ -283,7 +283,7 @@ mendel_readsym_target() {
local val=$(mendel_readsym "$sym") local val=$(mendel_readsym "$sym")
if [ -n "$val" ] if [ -n "$val" ]
then then
perl -e '@a = qw/X Y Z E F/; $c = 0; while (length $ARGV[0]) { $ARGV[0] =~ s#^(..)(..)(..)(..)##; printf "%s: %d\n", $a[$c], eval "0x$4$3$2$1"; $c++; }' "$val" perl -e '@a = qw/X Y Z E F/; $c = 0; while (length $ARGV[0]) { $ARGV[0] =~ s#^(..)(..)(..)(..)##; printf "%s: %d\n", $a[$c], hex "0x$4$3$2$1"; $c++; }' "$val"
fi fi
} }
@ -309,11 +309,11 @@ mendel_readsym_mb() {
} }
if (($a[$c * 2 + 1] & 7) == 4) { if (($a[$c * 2 + 1] & 7) == 4) {
$ARGV[1] =~ s#^(..)(..)(..)(..)##; $ARGV[1] =~ s#^(..)(..)(..)(..)##;
printf "\t%s: %d", $a[$c * 2], eval "0x$4$3$2$1"; printf "\t%s: %d", $a[$c * 2], hex "0x$4$3$2$1";
} }
elsif (($a[$c * 2 + 1] & 7) == 1) { elsif (($a[$c * 2 + 1] & 7) == 1) {
$ARGV[1] =~ s#^(..)##; $ARGV[1] =~ s#^(..)##;
printf "\t%s: %d", $a[$c * 2], eval "0x$1"; printf "\t%s: %d", $a[$c * 2], hex "0x$1";
} }
$c++; $c++;
} }