Skip to content

Commit

Permalink
add cvindexc.c
Browse files Browse the repository at this point in the history
  • Loading branch information
@WalterBright
WalterBright committed Dec 25, 2013
1 parent 4558716 commit 2fc505a
Show file tree
Hide file tree
Showing 4 changed files with 305 additions and 12 deletions.
5 changes: 4 additions & 1 deletion cv/cv.mak
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ $(LIB)\CV.LIB : $(OBJ)\CVMODALL.OBJ $(OBJ)\XDEBUG.OBJ $(OBJ)\CVMOD4.OBJ $(OBJ)\C
$(OBJ)\CVSYMBOL.OBJ $(OBJ)\CVTYPCON.OBJ $(OBJ)\CVGLBALL.OBJ $(OBJ)\CVSTAALL.OBJ $(OBJ)\CVPUBALL.OBJ $(OBJ)\CVTYPALL.OBJ \
$(OBJ)\INSTGSYM.OBJ $(OBJ)\CVFILALL.OBJ $(OBJ)\QSORTADR.OBJ $(OBJ)\DERIVATE.OBJ $(OBJ)\CVMOD3.OBJ \
$(OBJ)\CVPUBLIC.OBJ $(OBJ)\CVLINNUM.OBJ $(OBJ)\CVSYM1.OBJ \
$(OBJ)\cvlin4c.obj \
$(OBJ)\cvlin4c.obj $(OBJ)\cvindexc.obj \
$(OBJ)\instgsymc.obj $(OBJ)\cvsymbolc.obj $(OBJ)\cvhashesc.obj $(OBJ)\xdebugc.obj
$(BUILD_LIB)

Expand Down Expand Up @@ -104,6 +104,9 @@ $(OBJ)\DERIVATE.OBJ : DERIVATE.ASM ..\COMMON\MACROS ..\COMMON\CVTYPES
$(OBJ)\cvhashesc.obj : cvhashesc.c $(HEADERS)
dmc -c cvhashesc -NTCVPACK_TEXT $(CFLAGS) -o$(OBJ)\cvhashesc.obj

$(OBJ)\cvindexc.obj : cvindexc.c $(HEADERS)
dmc -c cvindexc -NTCVPACK_TEXT $(CFLAGS) -o$(OBJ)\cvindexc.obj

$(OBJ)\cvlin4c.obj : cvlin4c.c $(HEADERS)
dmc -c cvlin4c -NTCVPACK_TEXT $(CFLAGS) -o$(OBJ)\cvlin4c.obj

Expand Down
30 changes: 19 additions & 11 deletions cv/cvindex.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
.DATA

EXTERNDEF CV_INDEX_TEMP:BYTE,CV_HEADER:BYTE
externdef CV_INDEX_PTR_LIMIT:DWORD,CV_INDEX_BLOCK_END:DWORD

EXTERNDEF CURNMOD_GINDEX:DWORD,CV_INDEX_BLK:DWORD,CV_INDEX_BLK_PTR:DWORD,CV_INDEX_TABLE:DWORD
EXTERNDEF CV_INDEX_SIZE:DWORD,CV_INDEX_HDR_SIZE:DWORD,CV_INDEX_COUNT:DWORD,CV_INDEX_PTR:DWORD
Expand All @@ -18,17 +19,25 @@

.CODE PASS2_TEXT

externdef _handle_cv_index:proc

EXTERNDEF RELEASE_BLOCK:PROC,_xdebug_normal:proc,CONVERT_SUBBX_TO_EAX:PROC,GET_NEW_LOG_BLK:PROC,ERR_RET:PROC

EXTERNDEF CV_TOO_MANY_ERR:ABS

public _handle_cv_index
_handle_cv_index proc
mov ECX,8[ESP]
mov EAX,4[ESP]
_handle_cv_index endp
; public _handle_cv_index
;_handle_cv_index proc
; mov ECX,8[ESP]
; mov EAX,4[ESP]
;_handle_cv_index endp

HANDLE_CV_INDEX PROC
push ECX
push EAX
call _handle_cv_index
add ESP,8
ret

;
;EAX IS OLD BYTES_SO_FAR
;ECX IS INDEX TYPE
Expand All @@ -52,6 +61,11 @@ HANDLE_CV_INDEX PROC

HANDLE_CV_INDEX ENDP

public _write_cv_index
_write_cv_index proc
mov ECX,8[ESP]
mov EAX,4[ESP]
_write_cv_index endp

WRITE_CV_INDEX PROC
;
Expand Down Expand Up @@ -306,11 +320,5 @@ WRITE_INDEX_BLOCK PROC NEAR
WRITE_INDEX_BLOCK ENDP


.DATA?

CV_INDEX_PTR_LIMIT DD ?
CV_INDEX_BLOCK_END DD ?


END

281 changes: 281 additions & 0 deletions cv/cvindexc.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,281 @@

#include "all.h"

unsigned CV_INDEX_PTR_LIMIT = 0;
unsigned CV_INDEX_BLOCK_END = 0;

void _write_cv_index(unsigned, unsigned);

void _handle_cv_index(unsigned EAX, unsigned ECX)
{
// EAX IS OLD BYTES_SO_FAR
// ECX IS INDEX TYPE

unsigned EDX = ECX;
ECX = BYTES_SO_FAR;
BYTES_SO_FAR = EAX;
_write_cv_index(EDX, ECX - EAX);
BYTES_SO_FAR = ECX;
}

/*
WRITE_CV_INDEX PROC
;
;EAX IS INDEX TYPE, ECX IS LENGTH
;
PUSH EBX
MOV EBX,CV_INDEX_COUNT
MOV EDX,CV_INDEX_PTR ;LOCKED POINTER
INC EBX
MOV CV_INDEX_COUNT,EBX
MOV EBX,CV_INDEX_PTR_LIMIT
CMP EBX,EDX
JB L1$
L3$:
MOV EBX,CURNMOD_NUMBER
; seg fault here <<>>
MOV [EDX+8],ECX
SHL EBX,16
MOV ECX,BYTES_SO_FAR
OR EAX,EBX
MOV [EDX+4],ECX
MOV [EDX],EAX
ADD EDX,12
GETT AL,CV_4_TYPE
MOV CV_INDEX_PTR,EDX
OR AL,AL
JZ L35$
L36$:
POP EBX
RET
L35$:
MOV EAX,[EDX-4]
SUB EDX,2
CMP EAX,64K
MOV CV_INDEX_PTR,EDX
POP EBX
JAE L37$
RET
L37$:
MOV AX,CV_TOO_MANY_ERR
CALL ERR_RET
RET
L1$:
;
;WON'T ALL FIT IN BLOCK, SO BUFFER IT IN CV_INDEX_TEMP
;
MOV EBX,OFF L2$
PUSH EDX
PUSH EBX ;PUSH THROUGH DI IF NECESSARY
PUSH EBX ;GARBAGE TO POP BEFORE RETURN
MOV EDX,OFF CV_INDEX_TEMP
JMP L3$
L2$:
;
;MOVE AS MANY AS WILL FIT TO ORIGINAL BLOCK
;
POP EDX
MOV ECX,CV_INDEX_BLOCK_END
PUSH EDI
SUB ECX,EDX ;# OF BYTES IN FIRST BLOCK
SHR ECX,1 ;# OF WORDS
PUSH ESI
MOV ESI,OFF CV_INDEX_TEMP ;INDEX TEMP STORAGE
MOV EDX,ECX
REP MOVSW
PUSH EDX
CALL CV_INDEX_ANOTHER_BLOCK
POP EDX
MOV ECX,CV_INDEX_SIZE ;# OF WORDS IN AN INDEX ENTRY
SHR ECX,1
SUB ECX,EDX ;MINUS WORDS ALREADY MOVED
REP MOVSW
MOV CV_INDEX_PTR,EDI
POPM ESI,EDI,EBX
RET
WRITE_CV_INDEX ENDP
CV_INDEX_ANOTHER_BLOCK PROC
;
;
;
MOV EDX,CV_INDEX_BLK_PTR
CALL GET_NEW_LOG_BLK ;LEAVE IN FASTER MEMORY
MOV [EDX],EAX
ADD EDX,4
MOV EDI,EAX
ADD EAX,PAGE_SIZE
MOV CV_INDEX_BLK_PTR,EDX
MOV CV_INDEX_BLOCK_END,EAX
SUB EAX,CV_INDEX_SIZE
MOV CV_INDEX_PTR,EDI
MOV CV_INDEX_PTR_LIMIT,EAX
RET
CV_INDEX_ANOTHER_BLOCK ENDP
FLUSH_CV_INDEXES PROC
;
;WRITE OUT BUFFERED INDEX ENTRIES
;
;FIRST, STORE TOTAL SIZE OF INFORMATION
;
CALL CV_DWORD_ALIGN
MOV EDX,DPTR CV_HEADER
MOV EAX,CV_INDEX_COUNT
MOV DPTR CV_INDEX_TEMP,EDX
MOV EDX,CV_INDEX_SIZE
MUL EDX
MOV EDX,CV_INDEX_HDR_SIZE
ADD EAX,8 ;SIZE OF THIS SIGNATURE
ADD EAX,EDX
MOV EDX,BYTES_SO_FAR
ADD EAX,EDX
MOV DPTR CV_INDEX_TEMP+4,EAX
MOV EDX,CV_INDEX_PTR
MOV ECX,CV_INDEX_BLOCK_END
MOV EAX,DPTR CV_INDEX_TEMP
SUB ECX,EDX ;ROOM LEFT IN BUFFER
CMP ECX,8
JB L5$
MOV ECX,DPTR CV_INDEX_TEMP+4
MOV [EDX],EAX
MOV [EDX+4],ECX
ADD EDX,8
L6$:
MOV CV_INDEX_PTR,EDX
L1$:
;
;NEED TO FLUSH INDEX BUFFERS...
;
PUSH EBX
MOV EBX,OFF CV_INDEX_TABLE
L2$:
MOV EAX,DPTR [EBX+4]
MOV ECX,PAGE_SIZE ;WRITE FULL-SIZED BLOCK
TEST EAX,EAX ;LAST BLOCK?
JZ L3$
CALL WRITE_INDEX_BLOCK
ADD EBX,4
JMP L2$
L3$:
;
;NOW OUTPUT PARTIAL BLOCK
;
MOV EDX,CV_INDEX_BLOCK_END
MOV ECX,CV_INDEX_PTR
SUB EDX,PAGE_SIZE
SUB ECX,EDX
JZ L4$
CALL WRITE_INDEX_BLOCK
L4$:
POP EBX
RET
L5$:
PUSHM EDI,ESI
MOV EDI,EDX
MOV EDX,8
MOV ESI,OFF CV_INDEX_TEMP
SUB EDX,ECX
REP MOVSB
PUSH EDX
CALL CV_INDEX_ANOTHER_BLOCK
POP ECX
REP MOVSB
MOV EDX,EDI
JMP L6$
FLUSH_CV_INDEXES ENDP
WRITE_INDEX_BLOCK PROC NEAR
;
;BX POINTS TO BLOCK
;CX IS BLOCK SIZE, WRITE IT OUT
;
CALL CONVERT_SUBBX_TO_EAX
push ECX
push EAX
call _xdebug_normal
add ESP,8
XOR ECX,ECX
MOV EAX,[EBX]
MOV [EBX],ECX
JMP RELEASE_BLOCK
WRITE_INDEX_BLOCK ENDP
.DATA?
END
*/
1 change: 1 addition & 0 deletions makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ COMMONSRC= $(COMMONSRCC) \
CVSRCC= \
cv\instgsymc.c \
cv\cvhashesc.c \
cv\cvindexc.c \
cv\cvlin4c.c \
cv\cvsymbolc.c \
cv\xdebugc.c
Expand Down

0 comments on commit 2fc505a

Please sign in to comment.