[svn:parrot] r40562 - in branches/pmc_sans_unionval: src/gc src/string/charset tools/build
whiteknight at svn.parrot.org
whiteknight at svn.parrot.org
Sat Aug 15 13:15:47 UTC 2009
Author: whiteknight
Date: Sat Aug 15 13:15:44 2009
New Revision: 40562
URL: https://trac.parrot.org/parrot/changeset/40562
Log:
[pmc_sans_unionval] add another patch from jessevdam that makes this branch build and test perfectly on my system
Modified:
branches/pmc_sans_unionval/src/gc/alloc_resources.c
branches/pmc_sans_unionval/src/string/charset/unicode.c
branches/pmc_sans_unionval/tools/build/nativecall.pl
Modified: branches/pmc_sans_unionval/src/gc/alloc_resources.c
==============================================================================
--- branches/pmc_sans_unionval/src/gc/alloc_resources.c Sat Aug 15 12:05:28 2009 (r40561)
+++ branches/pmc_sans_unionval/src/gc/alloc_resources.c Sat Aug 15 13:15:44 2009 (r40562)
@@ -873,9 +873,10 @@
check_memory_pool(Memory_Pool *pool)
{
size_t count;
+ Memory_Block * block_walker;
count = 10000000; /*detect unendless loop just use big enough number*/
- Memory_Block * block_walker = (Memory_Block *)pool->top_block;
+ block_walker = (Memory_Block *)pool->top_block;
while(block_walker != NULL)
{
PARROT_ASSERT(block_walker->start == (char *)block_walker + sizeof (Memory_Block));
@@ -912,7 +913,7 @@
if(bufstart == NULL && Buffer_buflen(pobj) == 0)
return;
- if(PObj_external_TEST(pobj)) /*buffer does not come from the memory pool*/
+ if(PObj_external_TEST(pobj) || PObj_sysmem_TEST(pobj)) /*buffer does not come from the memory pool*/
{
if (PObj_is_string_TEST(pobj))
{
Modified: branches/pmc_sans_unionval/src/string/charset/unicode.c
==============================================================================
--- branches/pmc_sans_unionval/src/string/charset/unicode.c Sat Aug 15 12:05:28 2009 (r40561)
+++ branches/pmc_sans_unionval/src/string/charset/unicode.c Sat Aug 15 13:15:44 2009 (r40562)
@@ -440,7 +440,7 @@
/* use all available space - see below XXX */
/* TODO downcase, titlecase too */
- dest_len = PObj_buflen(src) / sizeof (UChar);
+ dest_len = Buffer_buflen(src) / sizeof (UChar);
src_len = src->bufused / sizeof (UChar);
/*
Modified: branches/pmc_sans_unionval/tools/build/nativecall.pl
==============================================================================
--- branches/pmc_sans_unionval/tools/build/nativecall.pl Sat Aug 15 12:05:28 2009 (r40561)
+++ branches/pmc_sans_unionval/tools/build/nativecall.pl Sat Aug 15 13:15:44 2009 (r40562)
@@ -405,7 +405,7 @@
/b/ && do {
push @{$temps_ref}, "STRING *t_$temp_num;";
push @{$extra_preamble_ref}, "t_$temp_num = GET_NCI_S($reg_num);";
- return "PObj_bufstart(t_$temp_num)";
+ return "Buffer_bufstart(t_$temp_num)";
};
/B/ && do {
push @{$temps_ref}, "char *s_$temp_num;\n char *t_$temp_num;\n void** v_$temp_num = (void **) &t_$temp_num;";
More information about the parrot-commits
mailing list