projects
/
pforth
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
tags
|
clone url
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into build64
[pforth]
/
csrc
/
pf_inner.c
diff --git
a/csrc/pf_inner.c
b/csrc/pf_inner.c
index
a157705
..
97fb004
100644
(file)
--- a/
csrc/pf_inner.c
+++ b/
csrc/pf_inner.c
@@
-197,8
+197,8
@@
static void TraceNames( ExecToken Token, cell_t Level )
static uint64_t UdToUint64( ucell_t Lo, ucell_t Hi )
{
return (( 2 * sizeof(ucell_t) == sizeof(uint64_t) )
static uint64_t UdToUint64( ucell_t Lo, ucell_t Hi )
{
return (( 2 * sizeof(ucell_t) == sizeof(uint64_t) )
-
? (((uint64_t)Lo) | (((uint64_t)Hi) >> (sizeof(ucell_t) * 8)))
-
: Lo
);
+ ? (((uint64_t)Lo) | (((uint64_t)Hi) >> (sizeof(ucell_t) * 8)))
+
: Lo
);
}
/* Return TRUE if the unsigned double cell integer LO/HI is not greater
}
/* Return TRUE if the unsigned double cell integer LO/HI is not greater
@@
-207,15
+207,15
@@
static uint64_t UdToUint64( ucell_t Lo, ucell_t Hi )
static int UdIsUint64( ucell_t Lo, ucell_t Hi )
{
return (( 2 * sizeof(ucell_t) == sizeof(uint64_t) )
static int UdIsUint64( ucell_t Lo, ucell_t Hi )
{
return (( 2 * sizeof(ucell_t) == sizeof(uint64_t) )
-
? TRUE
-
: Hi == 0
);
+ ? TRUE
+
: Hi == 0
);
}
}
-static const char *pfSelectFileModeCreate(
in
t fam );
-static const char *pfSelectFileModeOpen(
in
t fam );
+static const char *pfSelectFileModeCreate(
cell_
t fam );
+static const char *pfSelectFileModeOpen(
cell_
t fam );
/**************************************************************/
/**************************************************************/
-static const char *pfSelectFileModeCreate(
in
t fam )
+static const char *pfSelectFileModeCreate(
cell_
t fam )
{
const char *famText = NULL;
switch( fam )
{
const char *famText = NULL;
switch( fam )
@@
-240,7
+240,7
@@
static const char *pfSelectFileModeCreate( int fam )
}
/**************************************************************/
}
/**************************************************************/
-static const char *pfSelectFileModeOpen(
in
t fam )
+static const char *pfSelectFileModeOpen(
cell_
t fam )
{
const char *famText = NULL;
switch( fam )
{
const char *famText = NULL;
switch( fam )
@@
-269,7
+269,7
@@
static const char *pfSelectFileModeOpen( int fam )
}
/**************************************************************/
}
/**************************************************************/
-
int
pfCatch( ExecToken XT )
+
ThrowCode
pfCatch( ExecToken XT )
{
register cell_t TopOfStack; /* Cache for faster execution. */
register cell_t *DataStackPtr;
{
register cell_t TopOfStack; /* Cache for faster execution. */
register cell_t *DataStackPtr;
@@
-502,6
+502,7
@@
DBUGX(("After Branch: IP = 0x%x\n", InsPtr ));
endcase;
case ID_BYE:
endcase;
case ID_BYE:
+ EMIT_CR;
M_THROW( THROW_BYE );
endcase;
M_THROW( THROW_BYE );
endcase;
@@
-744,8
+745,8
@@
DBUGX(("After Branch: IP = 0x%x\n", InsPtr ));
/* Calculate product sign: */
sg = ((cell_t)(ahi ^ bhi) < 0);
/* Take absolute values and reduce to um* */
/* Calculate product sign: */
sg = ((cell_t)(ahi ^ bhi) < 0);
/* Take absolute values and reduce to um* */
- if ((cell_t)ahi < 0) ahi = (ucell_t)(-ahi);
- if ((cell_t)bhi < 0) bhi = (ucell_t)(-bhi);
+ if ((cell_t)ahi < 0) ahi = (ucell_t)(-
(cell_t)
ahi);
+ if ((cell_t)bhi < 0) bhi = (ucell_t)(-
(cell_t)
bhi);
/* Break into hi and lo 16 bit parts. */
alo = LOWER_HALF(ahi);
/* Break into hi and lo 16 bit parts. */
alo = LOWER_HALF(ahi);
@@
-1088,7
+1089,7
@@
DBUG(("XX ah,m,l = 0x%8x,%8x,%8x - qh,l = 0x%8x,%8x\n", ah,am,al, qh,ql ));
TOS = -3; /* TODO err num? */
break;
}
TOS = -3; /* TODO err num? */
break;
}
- offset = offsetLow;
+ offset =
(file_offset_t)
offsetLow;
TOS = sdSeekFile( FileID, offset, PF_SEEK_SET );
}
endcase;
TOS = sdSeekFile( FileID, offset, PF_SEEK_SET );
}
endcase;