diff options
| author | Sverker Eriksson <[email protected]> | 2014-05-20 20:10:52 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2014-05-20 20:10:52 +0200 |
| commit | 19a2d5ffcf1f248a0f3460e15c998703cba410f0 (patch) | |
| tree | 1c93ac0ece5bbad68d94224664dc9d399908d6ca | |
| parent | 2ca034c782eb545eb327487df2ea3de270413b21 (diff) | |
| parent | 8eccb186d9f19d1a14f44102acbd7a3a7bf3a029 (diff) | |
| download | otp-19a2d5ffcf1f248a0f3460e15c998703cba410f0.tar.gz otp-19a2d5ffcf1f248a0f3460e15c998703cba410f0.tar.bz2 otp-19a2d5ffcf1f248a0f3460e15c998703cba410f0.zip | |
Merge branch 'sverk/etp-block-fix' into maint
* sverk/etp-block-fix:
erts: Fix bug in etp-block commands
| -rw-r--r-- | erts/etc/unix/etp-commands.in | 4 |
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 |