[pypy-svn] r24272 - pypy/dist/pypy/rpython/memory

[mwh at codespeak.net]

Author: mwh
Date: Mon Mar 13 00:02:00 2006
New Revision: 24272

Modified:
   pypy/dist/pypy/rpython/memory/gctransform.py
Log:
reimplement for the framwork gcs a hack to add an extra byte to all strings.



Modified: pypy/dist/pypy/rpython/memory/gctransform.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/gctransform.py	(original)
+++ pypy/dist/pypy/rpython/memory/gctransform.py	Mon Mar 13 00:02:00 2006
@@ -9,6 +9,7 @@
 from pypy.rpython import rmodel, rptr, annlowlevel
 from pypy.rpython.memory import gc, lladdress
 from pypy.rpython.annlowlevel import MixLevelHelperAnnotator
+from pypy.rpython.rstr import STR
 import sets, os
 
 EXCEPTION_RAISING_OPS = ['direct_call', 'indirect_call']
@@ -827,6 +828,8 @@
                         info["ofstovar"] = ofs1 + llmemory.itemoffsetof(ARRAY, 0)
                     else:
                         info["fixedsize"] = ofs1 + llmemory.sizeof(lltype.Signed)
+                    if TYPE is STR:
+                        info["fixedsize"] = llmemory.sizeof(TYPE, 1)
                 else:
                     ARRAY = TYPE
                     info["ofstolength"] = llmemory.ArrayLengthOffset(ARRAY)