general/freetype2
2
0
Fork 0
mirror of git://git.sv.nongnu.org/freetype/freetype2.git synced 2026-01-19 04:52:09 +00:00
Code Issues Projects Releases Wiki Activity

[truetype] Modify bytecode steps.

Browse Source 
* src/truetype/ttinterp.h (TT_Exec_ContextRec): Remove 'step_ins'.
* src/truetype/ttinterp.c (TT_RunIns, Ins_Goto_CodeRange,
Ins_JMPR,ENDF,PUSHW,NPUSHW): Set and use zero increment 'length' instead.
(Ins_CALL,LOOPCALL,UNKNOWN): Updated.
This commit is contained in:
Alexei Podtelezhnikov
2025-05-02 19:45:14 -04:00
parent 3e079bd75e
commit b0febf5d91
2 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/truetype/ttinterp.c
View File

@@ -1597,6 +1597,7 @@
exc->code = range->base;
exc->codeSize = range->size;
exc->IP = aIP;
exc->length = 0;
exc->curRange = aRange;
return SUCCESS;
@@ -3427,7 +3428,7 @@
return;
}
exc->step_ins = FALSE;
exc->length = 0;
if ( args[0] < 0 )
{
@@ -3580,12 +3581,11 @@
pRec->Cur_Count--;
exc->step_ins = FALSE;
if ( pRec->Cur_Count > 0 )
{
exc->callTop++;
exc->IP = pRec->Def->start;
exc->IP = pRec->Def->start;
exc->length = 0;
}
else
/* Loop through the current function */
@@ -3673,8 +3673,6 @@
Ins_Goto_CodeRange( exc, def->range, def->start );
exc->step_ins = FALSE;
return;
Fail:
@@ -3752,8 +3750,6 @@
Ins_Goto_CodeRange( exc, def->range, def->start );
exc->step_ins = FALSE;
exc->loopcall_counter += (FT_ULong)args[0];
if ( exc->loopcall_counter > exc->loopcall_counter_max )
exc->error = FT_THROW( Execution_Too_Long );
@@ -3902,7 +3898,7 @@
for ( K = 0; K < L; K++ )
args[K] = GetShortIns( exc );
exc->step_ins = FALSE;
exc->length = 0;
exc->new_top += L;
}
@@ -3959,7 +3955,7 @@
for ( K = 0; K < L; K++ )
args[K] = GetShortIns( exc );
exc->step_ins = FALSE;
exc->length = 0;
}
@@ -6871,7 +6867,6 @@
Ins_Goto_CodeRange( exc, def->range, def->start );
exc->step_ins = FALSE;
return;
}
}
@@ -7084,8 +7079,7 @@
goto LErrorLabel_;
}
exc->step_ins = TRUE;
exc->error = FT_Err_Ok;
exc->error = FT_Err_Ok;
{
FT_Long* args = exc->stack + exc->args;
@@ -7686,9 +7680,7 @@
}
exc->top = exc->new_top;
if ( exc->step_ins )
exc->IP += exc->length;
exc->IP += exc->length;
/* increment instruction counter and check if we didn't */
/* run this program for too long (e.g. infinite loops). */

6
src/truetype/ttinterp.h
View File

@@ -142,11 +142,9 @@ FT_BEGIN_HEADER
FT_Long IP; /* current instruction pointer */
FT_Long codeSize; /* size of current range */
FT_Byte opcode; /* current opcode */
FT_Int length; /* length of current opcode */
FT_Byte opcode; /* current opcode */
FT_Int length; /* opcode length or increment */
FT_Bool step_ins; /* true if the interpreter must */
/* increment IP after ins. exec */
FT_ULong cvtSize; /* ! */
FT_Long* cvt; /* ! */
FT_ULong glyfCvtSize;