mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-09 13:10:57 -08:00
Code Issues Projects Releases Wiki Activity

Using mps_word_const instead of ull for proper fixes to constants

Browse source 
Copied from Perforce
 Change: 178196
 ServerID: perforce.ravenbrook.com
This commit is contained in:
David Lovemore 2012-05-17 15:18:50 +01:00
parent 1db05f0df4
commit d17c5b8296
10 changed files with 13 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mps/code/amcss.c
View file

@ -38,9 +38,7 @@ static mps_gen_param_s testChain[genCOUNT] = {
/* objNULL needs to be odd so that it's ignored in exactRoots. */
/* @@@@ W3I6MV Temporary fix (ull) to prevent Microsoft C complaining. Need
to work out what to do about such cases. */
#define objNULL ((mps_addr_t)0xDECEA5EDull)
#define objNULL ((mps_addr_t)MPS_WORD_CONST(0xDECEA5ED))
static mps_pool_t pool;

2
mps/code/amcsshe.c
View file

@ -41,7 +41,7 @@ static mps_gen_param_s testChain[genCOUNT] = {
/* objNULL needs to be odd so that it's ignored in exactRoots. */
#define objNULL ((mps_addr_t)0xDECEA5ED)
#define objNULL ((mps_addr_t)MPS_WORD_CONST(0xDECEA5ED))
static mps_pool_t pool;

2
mps/code/amcssth.c
View file

@ -38,7 +38,7 @@ static mps_gen_param_s testChain[genCOUNT] = {
/* objNULL needs to be odd so that it's ignored in exactRoots. */
#define objNULL ((mps_addr_t)0xDECEA5ED)
#define objNULL ((mps_addr_t)MPS_WORD_CONST(0xDECEA5ED))
static mps_pool_t pool;

2
mps/code/amsss.c
View file

@ -31,7 +31,7 @@
#define totalSizeSTEP 200 * (size_t)1024
/* objNULL needs to be odd so that it's ignored in exactRoots. */
/* @@@@ temporary fix W3I6MV */
#define objNULL ((mps_addr_t)0xDECEA5EDull)
#define objNULL ((mps_addr_t)MPS_WORD_CONST(0xDECEA5ED))
#define testArenaSIZE ((size_t)16<<20)
#define initTestFREQ 3000
#define splatTestFREQ 6000

3
mps/code/amssshe.c
View file

@ -28,8 +28,7 @@
#define totalSizeMAX 800 * (size_t)1024
#define totalSizeSTEP 200 * (size_t)1024
/* objNULL needs to be odd so that it's ignored in exactRoots. */
/* @@@@ Temporary fix for W3I6MV build ull */
#define objNULL ((mps_addr_t)0xDECEA5EDull)
#define objNULL ((mps_addr_t)MPS_WORD_CONST(0xDECEA5ED))
#define testArenaSIZE ((size_t)16<<20)
#define initTestFREQ 6000
static mps_gen_param_s testChain[1] = { { 160, 0.90 } };

2
mps/code/exposet0.c
View file

@ -45,7 +45,7 @@ static mps_gen_param_s testChain[genCOUNT] = {
/* objNULL needs to be odd so that it's ignored in exactRoots. */
#define objNULL ((mps_addr_t)0xDECEA5ED)
#define objNULL ((mps_addr_t)MPS_WORD_CONST(0xDECEA5ED))
static mps_pool_t pool_g;

9
mps/code/mpsicv.c
View file

@ -29,8 +29,7 @@
#define patternFREQ 100
/* objNULL needs to be odd so that it's ignored in exactRoots. */
/* @@@@ Temporary fix W3I6MV ull */
#define objNULL ((mps_addr_t)0xDECEA5EDull)
#define objNULL ((mps_addr_t)MPS_WORD_CONST(0xDECEA5ED))
#define FILLER_OBJECT_SIZE 1023
#define genCOUNT 2
@ -263,10 +262,10 @@ static void addr_pool_test(mps_arena_t arena,
mps_addr_t addr;
/* DISTInguished values are to observe overwrites. */
/* @@@@ Temporary fix W3I6MV ull */
mps_pool_t poolDistinguished = (mps_pool_t)0x000d1521ull;
mps_pool_t poolDistinguished = (mps_pool_t)MPS_WORD_CONST(0x000d1521);
mps_pool_t pool = poolDistinguished;
/* @@@@ Temporary fix W3I6MV ull */
mps_fmt_t fmtDistinguished = (mps_fmt_t)0x000d1521ull;
mps_fmt_t fmtDistinguished = (mps_fmt_t)MPS_WORD_CONST(0x000d1521);
mps_fmt_t fmt = fmtDistinguished;
/* 0a -- obj1 in pool1 (unformatted) */
@ -441,7 +440,7 @@ static void *test(void *arg, size_t s)
die(mps_root_create_table_masked(&exactRoot, arena,
MPS_RANK_EXACT, (mps_rm_t)0,
&exactRoots[0], exactRootsCOUNT,
(mps_word_t)1ull),
MPS_WORD_CONST(1)),
"root_create_table(exact)");
die(mps_root_create_table(&ambigRoot, arena,
MPS_RANK_AMBIG, (mps_rm_t)0,

3
mps/code/segsmss.c
View file

@ -714,8 +714,7 @@ static mps_class_t mps_class_amst(void)
#define totalSizeMAX sizeScale * 800 * (size_t)1024
#define totalSizeSTEP 200 * (size_t)1024
/* objNULL needs to be odd so that it's ignored in exactRoots. */
/* @@@@ Temporary fix W3I6MV */
#define objNULL ((mps_addr_t)0xDECEA5EDDECEA5ED)
#define objNULL ((mps_addr_t)MPS_WORD_CONST(0xDECEA5ED))
#define testArenaSIZE ((size_t)16<<20)
#define initTestFREQ 6000
#define stressTestFREQ 40

3
mps/code/steptest.c
View file

@ -63,8 +63,7 @@ static int test_number = 0;
/* objNULL needs to be odd so that it's ignored in exactRoots. */
/* @@@@ Temporary fix W3I6MV */
#define objNULL ((mps_addr_t)0xDECEA5EDull)
#define objNULL ((mps_addr_t)MPS_WORD_CONST(0xDECEA5ED))
static mps_pool_t pool;
static mps_ap_t ap;

2
mps/code/walkt0.c
View file

@ -42,7 +42,7 @@ static mps_gen_param_s testChain[genCOUNT] = {
};
/* objNULL needs to be odd so that it's ignored in exactRoots. */
#define objNULL ((mps_addr_t)0xDECEA5ED)
#define objNULL ((mps_addr_t)MPS_WORD_CONST(0xDECEA5ED))
static mps_ap_t ap;
static mps_addr_t exactRoots[exactRootsCOUNT];