Skip to content

Commit

Permalink
CREATE AAP SEE AAP crashed in 64 bit mode. Heuristic FIND-HEAD was put
Browse files Browse the repository at this point in the history
off by the offset of hlnoop. offset changed
cosmetics
Added quotation [: ;]
Correct message how to build with nasm
  • Loading branch information
albert committed Feb 14, 2016
1 parent eb5923d commit ebf5443
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 33 deletions.
7 changes: 5 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -467,9 +467,12 @@ stealconstant: stealconstant.c ; \
# Build these only on the linux 32 ,linux 64, osx target,
# otherwise consider the constantxx files sources.
constant.m4 : stealconstant ; $+ >$@
constant_64.m4 : stealconstant ; $+ >$@
constant_osx.m4 : stealconstant ; $+ >$@
constant_64.m4 : stealconstant_64; $+ >$@
constant_osx.m4 : stealconstant_osx ; $+ >$@

stealconstant_64: ; echo build stealconstant for 64 bit, then rename it

stealconstant_osx: ; echo build stealconstant for osx, then rename it

# Add temporary stuff for testing, if needed.
include test.mak
52 changes: 26 additions & 26 deletions blocks.frt
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
ELSE "BDOSN" PRESENT IF
"wina.pdf" SYSTEM THEN THEN ;

( -syscalls- ) CF: ?LI ?32 \ AvdH B4feb10
( -syscalls- ) CF: ?LI ?32 \ AvdH B5feb08
DECIMAL
13 CONSTANT __NR_time
43 CONSTANT __NR_times
Expand All @@ -122,11 +122,11 @@ DECIMAL
12 CONSTANT __NR_chdir

HEX
36 CONSTANT __NR_ioctl
8E CONSTANT __NR_select

36 CONSTANT __NR_ioctl 8E CONSTANT __NR_select
2A CONSTANT __NR_pipe
65 CONSTANT __NR_ioperm 6E CONSTANT __NR_iopl
CREATE -syscalls- DECIMAL
( -syscalls- ) CF: ?LI ?64 \ AvdH B4feb10
( -syscalls- ) CF: ?LI ?64 \ AvdH B5feb08
DECIMAL
201 CONSTANT __NR_time
100 CONSTANT __NR_times
Expand All @@ -138,9 +138,9 @@ DECIMAL
80 CONSTANT __NR_chdir

HEX
10 CONSTANT __NR_ioctl
17 CONSTANT __NR_select

10 CONSTANT __NR_ioctl 17 CONSTANT __NR_select
16 CONSTANT __NR_pipe
0AD CONSTANT __NR_ioperm 0AC CONSTANT __NR_iopl
CREATE -syscalls- DECIMAL
( -syscalls- ) CF: ?OSX \ AvdH B4feb10

Expand Down Expand Up @@ -1790,23 +1790,23 @@ TASK-TABLE !BAG _ TASK-TABLE BAG+! SET-FIRST-TASK
'EXIT-COT >DFA @ R@ CELL+ CELL+ !
R> TASK-TABLE BAG+! ;
\
( {{ }} ) \ AHCH B5mar03
"NESTED-COMPILE" WANTED
( {{ }} [: ;] ) \ AHCH B6feb11
WANT UNLINK-LATEST
\ New context for definitions, maybe in the middle of a word.
: {{ ( NESTED-COMPILE ) POSTPONE SKIP (FORWARD R>
: {{ POSTPONE SKIP (FORWARD R>
CSP @ >R DPL @ >R UNLINK-LATEST >R STATE @ >R
>R POSTPONE [ ; IMMEDIATE

: }} FORWARD) R>
R> STATE ! R> LINK-LATEST R> DPL ! R> CSP !
>R ;






( NESTED-COMPILE ) \ AvdH A2oct28
\ Compact version of :NONAME .. ; not linked in.
: {{{ HERE 'TASK @ , HERE CELL+ , ] ;
: }}} '(;) , POSTPONE [ ; IMMEDIATE
\ Official 2012 standard quotation.
: [: POSTPONE SKIP (FORWARD {{{ SWAP ; IMMEDIATE
: ;] POSTPONE }}} ] FORWARD) POSTPONE LITERAL ; IMMEDIATE
( NESTED-COMPILE UNLINK-LATEST ) \ AvdH B5feb11

\ Isolate the latest word from the dictionary. Leave its DEA.
: UNLINK-LATEST LATEST CURRENT @ >LFA DUP @ >LFA @ SWAP ! ;
Expand Down Expand Up @@ -2126,8 +2126,8 @@ DROP KEY DROP .S ;
: NEW-BLOCK BLOCK2 DB ;
: DB-INSTALL 'NEW-BLOCK 'BLOCK 3 CELLS MOVE ;
: DB-UNINSTALL 'BLOCK2 'BLOCK 3 CELLS MOVE ;
( KRAAK CRACK CRACK-CHAIN ) \ AvdH A2mar21
"SEE" WANTED
( KRAAK CRACK CRACKED ) \ AvdH B5feb14
WANT SEE



Expand Down Expand Up @@ -2230,14 +2230,14 @@ DROP KEY DROP .S ;
BEGIN DUP HEAD? 0= WHILE 1 CELLS - REPEAT ;
\ For DEA: hl POINTER in ``DOES>'' code.
: TO-DOES >DFA @ @ ;

: -dd DUP TO-DOES FIND-HEAD ." ( data ) " ID. ID. CR ;
' FORTH example-by: -dd \ Use namespace as example.






( SEE -see6-colon&literals- )
( dip -- dip )
: ITEM DUP @ SEL@ IF EXECUTE ( special) ALIGNED ELSE
Expand Down Expand Up @@ -2270,11 +2270,12 @@ DROP KEY DROP .S ;



( SEE -see8- \ AvdH B2oct02
( SEE -see8- ) \ AvdH B5feb14
\ CRACKED is the central word.
\ Use CRACK "ITEM" to decompile the word ITEM)
: CRACK ' CRACKED ;
: KRAAK CRACK ;
: SEE CRACK ;
: SEE ' CRACKED ;
: CRACK SEE ;
: KRAAK CRACK ; \ Dutch synonym
\ Crack from "name" then newer words.
: CRACK-FROM ' BEGIN DUP CRACKED 'NEXT-DEA CATCH UNTIL
DROP ;
Expand All @@ -2285,7 +2286,6 @@ DROP KEY DROP .S ;




( ASSEMBLER CODE END-CODE C; ) \ AvdH A0oct21
NAMESPACE ASSEMBLER
\ ISO standard words.
Expand Down
7 changes: 4 additions & 3 deletions ci86.gnr
Original file line number Diff line number Diff line change
Expand Up @@ -4424,6 +4424,7 @@ DODOE: LEA RPO,[RPO - _CELLS(1)] _C{Push HIP.}
LEA AX,[HIP+_CELLS(1)]
MOV HIP,[HIP]
_PUSH
DC 0 _C{ In behalf of FIND-HEAD in decompilation}
HLNOOP: DC SEMIS
_C
worddoc( {DEFINING},{DOES>},{does},{},{ISO,FIG},
Expand Down Expand Up @@ -8463,7 +8464,7 @@ that excess characters after forthvar({count}) are ignored.
The number of characters not
including the forthkey({RET}) is returned into forthvar({n}).
},
{{(ACCEPT)},{KEY},{KEY?},{(ACCEPT)}},
{{(ACCEPT)},{KEY},{KEY?}},
{
{PAD 10 ACCEPT},{},
{GIBBON
Expand Down Expand Up @@ -8765,7 +8766,7 @@ The number of characters not
including the forthkey({RET}) is returned into forthvar({n}).
The data at adr remains valid indefinitely.
},
{{(ACCEPT)},{KEY},{KEY?},{(ACCEPT)}},
{{(ACCEPT)},{KEY},{KEY?}},
{
{PAD 10 ACCEPT},{},
{GIBBON
Expand Down Expand Up @@ -8916,7 +8917,7 @@ forthkey({F3}) and cursor keys probably work as usual with a console application
Note that excess characters after forthvar({count}) are ignored. The number of
characters not including the forthkey({RET}) is returned into
forthvar({n}). },
{{(ACCEPT)},{KEY},{KEY?},{(ACCEPT)}},
{{(ACCEPT)},{KEY},{KEY?}},
{
{PAD 10 ACCEPT},{},
{GIBBON
Expand Down
4 changes: 4 additions & 0 deletions logforth.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13771,6 +13771,8 @@ said above).
There was also a remark about wc.script from Frans van de Markt.
I now tell the user to install lina properly before attempting the wc.script.
The readme is also refurbished.
This is release 5.2.1 with no changes in ci86.gnr and the above one line
in forth.lab.

2015 june 30

Expand Down Expand Up @@ -13910,6 +13912,8 @@ Furthermore the tests failed because WANT was used. Changed those to
used WANTED, blocks.frt was already changed to use WANTED.
blocks.frt 5.110 ci86.gnr 5.132 allow threading pet in 64 bit.

2016 feb 11
Added [: (quotation). Also {{{ }}} that is a slim version of :NONAME
--------------------
officialdecompilation fails on SEE _pad.

Expand Down
10 changes: 8 additions & 2 deletions nasm.m4
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,14 @@ _HOSTED_OSX_({
})
_LINUX_N_({
; This version can be assembled on a Linux system by
; nasm forth.asm -felf -o forth.o
; ld -N forth.o -o forth
_BITS32_({ ; nasm forth.asm -o forth.o
; ld -melf_i386 -N forth.o -o forth
; Tested with nasm version 2.10.01.
})
_BITS64_({ ; nasm forth.asm -felf64 -o forth.o
; ld -melf_x86_64 -N forth.o -o forth
; Tested with nasm version 2.10.01.
})
;And to get the smallest possible executable(optional):
; strip forth -s -R .data
})
Expand Down

0 comments on commit ebf5443

Please sign in to comment.