diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-11-01 15:16:41 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-11-01 15:16:41 +0000 |
| commit | 8a9d84fe3638cf1cb535f2cfa6448e4d6cd085a2 (patch) | |
| tree | ebc8e75087e19ba1503062f986e99e2f3a954fd3 /basic/source/runtime/runtime.cxx | |
| parent | 2dc174c983bc1df3eb8868d4fb581eca8a3c76c6 (diff) | |
INTEGRATION: CWS npower3 (1.26.42); FILE MERGED
2006/09/28 22:31:31 npower 1.26.42.4: RESYNC: (1.29-1.30); FILE MERGED
2006/07/27 18:16:45 npower 1.26.42.3: RESYNC: (1.28-1.29); FILE MERGED
2006/06/28 11:05:36 npower 1.26.42.2: RESYNC: (1.26-1.28); FILE MERGED
2006/04/20 09:41:57 npower 1.26.42.1: #i64377# initial modifications to support large program sizes
Diffstat (limited to 'basic/source/runtime/runtime.cxx')
| -rw-r--r-- | basic/source/runtime/runtime.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index 572910df4987..8e60d7dec9c9 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -4,9 +4,9 @@ * * $RCSfile: runtime.cxx,v $ * - * $Revision: 1.31 $ + * $Revision: 1.32 $ * - * last change: $Author: obo $ $Date: 2006-10-12 14:30:29 $ + * last change: $Author: vg $ $Date: 2006-11-01 16:16:41 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -500,7 +500,7 @@ SbxArray* SbiInstance::GetLocals( SbMethod* pMeth ) // Achtung: pMeth kann auch NULL sein (beim Aufruf des Init-Codes) -SbiRuntime::SbiRuntime( SbModule* pm, SbMethod* pe, USHORT nStart ) +SbiRuntime::SbiRuntime( SbModule* pm, SbMethod* pe, UINT32 nStart ) : rBasic( *(StarBASIC*)pm->pParent ), pInst( pINST ), pMod( pm ), pMeth( pe ), pImg( pMod->pImage ) { @@ -666,22 +666,22 @@ BOOL SbiRuntime::Step() if( pInst->IsReschedule() && bStaticGlobalEnableReschedule ) Application::Reschedule(); } - SbiOpcode eOp = (SbiOpcode ) ( *pCode++ ); - USHORT nOp1, nOp2; + UINT32 nOp1, nOp2; if( eOp <= SbOP0_END ) { (this->*( aStep0[ eOp ] ) )(); } else if( eOp >= SbOP1_START && eOp <= SbOP1_END ) { - nOp1 = *pCode++; nOp1 |= *pCode++ << 8; + nOp1 = *pCode++; nOp1 |= *pCode++ << 8; nOp1 |= *pCode++ << 16; nOp1 |= *pCode++ << 24; + (this->*( aStep1[ eOp - SbOP1_START ] ) )( nOp1 ); } else if( eOp >= SbOP2_START && eOp <= SbOP2_END ) { - nOp1 = *pCode++; nOp1 |= *pCode++ << 8; - nOp2 = *pCode++; nOp2 |= *pCode++ << 8; + nOp1 = *pCode++; nOp1 |= *pCode++ << 8; nOp1 |= *pCode++ << 16; nOp1 |= *pCode++ << 24; + nOp2 = *pCode++; nOp2 |= *pCode++ << 8; nOp2 |= *pCode++ << 16; nOp2 |= *pCode++ << 24; (this->*( aStep2[ eOp - SbOP2_START ] ) )( nOp1, nOp2 ); } else |