Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-05 16:46:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 381779: patch from Gavin Reaney to improve memeory allocation for the sprint stack. r=myself

Browse Source
This commit is contained in:
igor@mir2.org 2007-05-25 04:35:27 -07:00
parent d6780239eb
commit 008b90c67c
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
js/src/jsopcode.c
View File

@ -380,8 +380,13 @@ typedef struct Sprinter {
#define RETRACT(sp,str) ((sp)->offset = STR2OFF(sp, str)) #define RETRACT(sp,str) ((sp)->offset = STR2OFF(sp, str))
static JSBool static JSBool
SprintAlloc(Sprinter *sp, size_t nb) SprintEnsureBuffer(Sprinter *sp, size_t len)
{ {
ptrdiff_t nb;
nb = (sp->offset + len + 1) - sp->size;
if (nb < 0)
return JS_TRUE;
if (!sp->base) { if (!sp->base) {
JS_ARENA_ALLOCATE_CAST(sp->base, char *, sp->pool, nb); JS_ARENA_ALLOCATE_CAST(sp->base, char *, sp->pool, nb);
} else { } else {
@ -398,12 +403,11 @@ SprintAlloc(Sprinter *sp, size_t nb)
static ptrdiff_t static ptrdiff_t
SprintPut(Sprinter *sp, const char *s, size_t len) SprintPut(Sprinter *sp, const char *s, size_t len)
{ {
ptrdiff_t nb, offset; ptrdiff_t offset;
char *bp; char *bp;
/* Allocate space for s, including the '\0' at the end. */ /* Allocate space for s, including the '\0' at the end. */
nb = (sp->offset + len + 1) - sp->size; if (!SprintEnsureBuffer(sp, len))
if (nb > 0 && !SprintAlloc(sp, nb))
return -1; return -1;
/* Advance offset and copy s into sp's buffer. */ /* Advance offset and copy s into sp's buffer. */
@ -434,7 +438,7 @@ SprintString(Sprinter *sp, JSString *str)
return sp->offset; return sp->offset;
size = js_GetDeflatedStringLength(sp->context, chars, length); size = js_GetDeflatedStringLength(sp->context, chars, length);
if (size == (size_t)-1 || !SprintAlloc(sp, size + 1)) if (size == (size_t)-1 || !SprintEnsureBuffer(sp, size))
return -1; return -1;
offset = sp->offset; offset = sp->offset;
@ -485,7 +489,7 @@ QuoteString(Sprinter *sp, JSString *str, uint32 quote)
{ {
JSBool dontEscape, ok; JSBool dontEscape, ok;
jschar qc, c; jschar qc, c;
ptrdiff_t off, len, nb; ptrdiff_t off, len;
const jschar *s, *t, *z; const jschar *s, *t, *z;
const char *e; const char *e;
char *bp; char *bp;
@ -511,8 +515,7 @@ QuoteString(Sprinter *sp, JSString *str, uint32 quote)
len = PTRDIFF(t, s, jschar); len = PTRDIFF(t, s, jschar);
/* Allocate space for s, including the '\0' at the end. */ /* Allocate space for s, including the '\0' at the end. */
nb = (sp->offset + len + 1) - sp->size; if (!SprintEnsureBuffer(sp, len))
if (nb > 0 && !SprintAlloc(sp, nb))
return NULL; return NULL;
/* Advance sp->offset and copy s into sp's buffer. */ /* Advance sp->offset and copy s into sp's buffer. */
@ -883,7 +886,7 @@ PushOff(SprintStack *ss, ptrdiff_t off, JSOp op)
{ {
uintN top; uintN top;
if (!SprintAlloc(&ss->sprinter, PAREN_SLOP)) if (!SprintEnsureBuffer(&ss->sprinter, PAREN_SLOP))
return JS_FALSE; return JS_FALSE;
/* ss->top points to the next free slot; be paranoid about overflow. */ /* ss->top points to the next free slot; be paranoid about overflow. */