aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2014-05-20 20:13:50 +0200
committerSverker Eriksson <[email protected]>2014-05-20 20:13:50 +0200
commit23f73961cbd2d48b019214dcba243afb80034ce9 (patch)
treec2fd52dab9ec4eaf4907c16716ce568a8e97c0ce
parent7d78f2563e4ef9f7f165b1ba06212c6f09167809 (diff)
parent19a2d5ffcf1f248a0f3460e15c998703cba410f0 (diff)
downloadotp-23f73961cbd2d48b019214dcba243afb80034ce9.tar.gz
otp-23f73961cbd2d48b019214dcba243afb80034ce9.tar.bz2
otp-23f73961cbd2d48b019214dcba243afb80034ce9.zip
Merge branch 'maint'
-rw-r--r--erts/etc/unix/etp-commands.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/etc/unix/etp-commands.in b/erts/etc/unix/etp-commands.in
index ed90e26024..ae1b1734af 100644
--- a/erts/etc/unix/etp-commands.in
+++ b/erts/etc/unix/etp-commands.in
@@ -3277,7 +3277,7 @@ define etp-block-size-1
else
set $etp_MBC_ABLK_OFFSET_SHIFT = (32 - 9)
end
- set $etp_MBC_ABLK_SZ_MASK = ~(~0 << $etp_MBC_ABLK_OFFSET_SHIFT) & ~7
+ set $etp_MBC_ABLK_SZ_MASK = ((UWord)1 << $etp_MBC_ABLK_OFFSET_SHIFT) - 1 - 7
end
set $etp_blk_sz = ($arg0)->bhdr & $etp_MBC_ABLK_SZ_MASK
end
@@ -3300,7 +3300,7 @@ define etp-block2mbc-1
set $etp_MBC_ABLK_OFFSET_SHIFT = (32 - 9)
end
end
- set $etp_mbc = (Carrier_t*) ((((UWord)($arg0)) & (~0 << 18)) - ((($arg0)->bhdr >> $etp_MBC_ABLK_OFFSET_SHIFT) << 18))
+ set $etp_mbc = (Carrier_t*) ((((UWord)($arg0) >> 18) - (($arg0)->bhdr >> $etp_MBC_ABLK_OFFSET_SHIFT)) << 18)
end
end