np2/i286x/memory.x86 - diff

Return to memory.x86 CVS log

Up to [RetroPC.NET] / np2 / i286x

Diff for /np2/i286x/memory.x86 between versions 1.13 and 1.16

version 1.13, 2005/02/08 09:18:59	version 1.16, 2011/02/02 13:50:29
Line 2	Line 2
;	;
; ToDo: egc word-boundary	; ToDo: egc word-boundary

%include 'x86/np2asm.inc'	%include 'np2asm.inc'
	%include 'cpucore.inc'
	%include 'iocore.inc'
	%include 'vram.inc'

section .bss	section .bss

global _mem	global _mem
extern _i286core	extern _i286core
extern _grcg
extern _gdcs
extern _tramupdate	extern _tramupdate
extern _vramupdate	extern _vramupdate
extern _cgwindow
extern _vramop	extern _vramop

_mem resb 0x200000	_mem resb 0x200000
Line 23 EXTMEMORY equ 0	Line 23 EXTMEMORY equ 0
VIDEOMEMORY equ _mem	VIDEOMEMORY equ _mem
USERSMEMORY_R equ 0a8000h	USERSMEMORY_R equ 0a8000h
USERSMEMORY_W equ 0a0000h	USERSMEMORY_W equ 0a0000h
_extmemmng_ptr equ _i286core + i286core_t.ext	_extmemmng_ptr equ _i286core + cpucore_t.ext
_extmemmng_size equ _i286core + i286core_t.extsize	_extmemmng_size equ _i286core + cpucore_t.extsize

%if 1	%if 1
_font equ _mem + FONT_ADRS	_font equ _mem + FONT_ADRS
Line 96 section .text	Line 96 section .text
; normal memory	; normal memory
align 16	align 16
@i286_wt: mov ebx, ecx	@i286_wt: mov ebx, ecx
and ebx, [_i286core + i286core_t.adrsmask]	and ebx, [_i286core + cpucore_t.adrsmask]
mov [MAINMEMORY + ebx], dl	mov [MAINMEMORY + ebx], dl
pop ebx	pop ebx
ret	ret
Line 104 section .text	Line 104 section .text
; tram write	; tram write
align 16	align 16
@tram_wt: mov ebx, [_vramop + vramop_t.tramwait]	@tram_wt: mov ebx, [_vramop + vramop_t.tramwait]
sub [_i286core + i286core_t.remainclock], ebx	sub [_i286core + cpucore_t.remainclock], ebx
mov ebx, ecx	mov ebx, ecx
cmp ecx, 000a2000h	cmp ecx, 000a2000h
jnc short wtram_a	jnc short wtram_a
Line 155 wcgwindow_e: pop ebx	Line 155 wcgwindow_e: pop ebx
or byte [_vramupdate + ebx], 1	or byte [_vramupdate + ebx], 1
or byte [_gdcs + gdcs_t.grphdisp], 1	or byte [_gdcs + gdcs_t.grphdisp], 1
mov ebx, [_vramop + vramop_t.vramwait]	mov ebx, [_vramop + vramop_t.vramwait]
sub [_i286core + i286core_t.remainclock], ebx	sub [_i286core + cpucore_t.remainclock], ebx
pop ebx	pop ebx
ret	ret

Line 167 wcgwindow_e: pop ebx	Line 167 wcgwindow_e: pop ebx
or byte [_vramupdate + ebx], 2	or byte [_vramupdate + ebx], 2
or byte [_gdcs + gdcs_t.grphdisp], 2	or byte [_gdcs + gdcs_t.grphdisp], 2
mov ebx, [_vramop + vramop_t.vramwait]	mov ebx, [_vramop + vramop_t.vramwait]
sub [_i286core + i286core_t.remainclock], ebx	sub [_i286core + cpucore_t.remainclock], ebx
pop ebx	pop ebx
ret	ret

Line 188 wcgwindow_e: pop ebx	Line 188 wcgwindow_e: pop ebx
or byte [_gdcs + gdcs_t.grphdisp], 1	or byte [_gdcs + gdcs_t.grphdisp], 1

grcg_rmw: mov ebx, [_vramop + vramop_t.grcgwait]	grcg_rmw: mov ebx, [_vramop + vramop_t.grcgwait]
sub [_i286core + i286core_t.remainclock], ebx	sub [_i286core + cpucore_t.remainclock], ebx
mov ebx, dword [_grcg + grcg_t.mode]	mov ebx, dword [_grcg + grcg_t.mode]
mov bl, dl	mov bl, dl
not bl	not bl
Line 237 grcgrmw_end: pop ecx	Line 237 grcgrmw_end: pop ecx
or byte [_gdcs + gdcs_t.grphdisp], 1	or byte [_gdcs + gdcs_t.grphdisp], 1

grcg_tdw: mov ebx, [_vramop + vramop_t.grcgwait]	grcg_tdw: mov ebx, [_vramop + vramop_t.grcgwait]
sub [_i286core + i286core_t.remainclock], ebx	sub [_i286core + cpucore_t.remainclock], ebx
mov bh, [_grcg + grcg_t.modereg]	mov bh, [_grcg + grcg_t.modereg]
shr bh, 1	shr bh, 1
jc short grcgtdw_r	jc short grcgtdw_r
Line 263 grcgtdw_end: pop ecx	Line 263 grcgtdw_end: pop ecx
align 16	align 16
@egc_wt: VRAMTRACE	@egc_wt: VRAMTRACE
mov ebx, [_vramop + vramop_t.grcgwait]	mov ebx, [_vramop + vramop_t.grcgwait]
sub [_i286core + i286core_t.remainclock], ebx	sub [_i286core + cpucore_t.remainclock], ebx
pop ebx	pop ebx
%if USE_EGCASM	%if USE_EGCASM
jmp egc_write	jmp egc_write
Line 281 grcgtdw_end: pop ecx	Line 281 grcgtdw_end: pop ecx
and ecx, 3fffh	and ecx, 3fffh
shr ebx, 12	shr ebx, 12
and ebx, byte (3*4)	and ebx, byte (3*4)
add ecx, [_i286core + i286core_t.ems + ebx]	add ecx, [_i286core + cpucore_t.ems + ebx]
mov [EXTMEMORY + ecx], dl	mov [EXTMEMORY + ecx], dl
pop ecx	pop ecx
pop ebx	pop ebx
Line 302 grcgtdw_end: pop ecx	Line 302 grcgtdw_end: pop ecx
; normal memory	; normal memory
align 16	align 16
@i286_rd: mov ebx, ecx	@i286_rd: mov ebx, ecx
and ebx, [_i286core + i286core_t.adrsmask]	and ebx, [_i286core + cpucore_t.adrsmask]
mov al, [MAINMEMORY + ebx]	mov al, [MAINMEMORY + ebx]
pop ebx	pop ebx
ret	ret
Line 310 grcgtdw_end: pop ecx	Line 310 grcgtdw_end: pop ecx
; font cg-window	; font cg-window
align 16	align 16
@tram_rd: mov ebx, [_vramop + vramop_t.tramwait]	@tram_rd: mov ebx, [_vramop + vramop_t.tramwait]
sub [_i286core + i286core_t.remainclock], ebx	sub [_i286core + cpucore_t.remainclock], ebx
cmp ecx, 0a4000h	cmp ecx, 0a4000h
jnc rcgwindow_s	jnc rcgwindow_s
rcgwindow_n: mov al, [MAINMEMORY + ecx]	rcgwindow_n: mov al, [MAINMEMORY + ecx]
Line 333 rcgwindow_s: cmp ecx, 0a5000h	Line 333 rcgwindow_s: cmp ecx, 0a5000h
align 16	align 16
@vram_r0: mov al, [VIDEOMEMORY + ecx]	@vram_r0: mov al, [VIDEOMEMORY + ecx]
mov ebx, [_vramop + vramop_t.vramwait]	mov ebx, [_vramop + vramop_t.vramwait]
sub [_i286core + i286core_t.remainclock], ebx	sub [_i286core + cpucore_t.remainclock], ebx
pop ebx	pop ebx
ret	ret

Line 341 rcgwindow_s: cmp ecx, 0a5000h	Line 341 rcgwindow_s: cmp ecx, 0a5000h
align 16	align 16
@vram_r1: mov al, [VIDEOMEMORY + VRAM_STEP + ecx]	@vram_r1: mov al, [VIDEOMEMORY + VRAM_STEP + ecx]
mov ebx, [_vramop + vramop_t.vramwait]	mov ebx, [_vramop + vramop_t.vramwait]
sub [_i286core + i286core_t.remainclock], ebx	sub [_i286core + cpucore_t.remainclock], ebx
pop ebx	pop ebx
ret	ret

Line 356 rcgwindow_s: cmp ecx, 0a5000h	Line 356 rcgwindow_s: cmp ecx, 0a5000h
and ecx, 7fffh	and ecx, 7fffh

grcg_tcr: mov ebx, [_vramop + vramop_t.grcgwait]	grcg_tcr: mov ebx, [_vramop + vramop_t.grcgwait]
sub [_i286core + i286core_t.remainclock], ebx	sub [_i286core + cpucore_t.remainclock], ebx
mov al, 0	mov al, 0
mov bh, [_grcg + grcg_t.modereg]	mov bh, [_grcg + grcg_t.modereg]
shr bh, 1	shr bh, 1
Line 386 grcgtcr_end: not al	Line 386 grcgtcr_end: not al
; EGC bridge	; EGC bridge
align 16	align 16
@egc_rd: mov ebx, [_vramop + vramop_t.grcgwait]	@egc_rd: mov ebx, [_vramop + vramop_t.grcgwait]
sub [_i286core + i286core_t.remainclock], ebx	sub [_i286core + cpucore_t.remainclock], ebx
pop ebx	pop ebx
%if USE_EGCASM	%if USE_EGCASM
jmp egc_read	jmp egc_read
Line 406 grcgtcr_end: not al	Line 406 grcgtcr_end: not al
and ecx, 3fffh	and ecx, 3fffh
shr ebx, 12	shr ebx, 12
and ebx, byte (3*4)	and ebx, byte (3*4)
add ecx, [_i286core + i286core_t.ems + ebx]	add ecx, [_i286core + cpucore_t.ems + ebx]
mov al, [EXTMEMORY + ecx]	mov al, [EXTMEMORY + ecx]
pop ecx	pop ecx
pop ebx	pop ebx
Line 415 grcgtcr_end: not al	Line 415 grcgtcr_end: not al
; BIOS or ITF	; BIOS or ITF
align 16	align 16
@i286_rb: pop ebx	@i286_rb: pop ebx
cmp byte [_i286core + i286core_t.itfbank], 0	cmp byte [_i286core + cpucore_t.itfbank], 0
jne readmem_itf	jne readmem_itf
mov al, [MAINMEMORY + ecx]	mov al, [MAINMEMORY + ecx]
ret	ret
Line 427 readmem_itf: mov al, [MAINMEMORY + VRA	Line 427 readmem_itf: mov al, [MAINMEMORY + VRA
; normal memory	; normal memory
align 16	align 16
@i286w_wt: mov ebx, ecx	@i286w_wt: mov ebx, ecx
and ebx, [_i286core + i286core_t.adrsmask]	and ebx, [_i286core + cpucore_t.adrsmask]
mov [MAINMEMORY + ebx], dx	mov [MAINMEMORY + ebx], dx
pop ebx	pop ebx
ret	ret
Line 435 readmem_itf: mov al, [MAINMEMORY + VRA	Line 435 readmem_itf: mov al, [MAINMEMORY + VRA
; tram write	; tram write
align 16	align 16
@tramw_wt: mov ebx, [_vramop + vramop_t.tramwait]	@tramw_wt: mov ebx, [_vramop + vramop_t.tramwait]
sub [_i286core + i286core_t.remainclock], ebx	sub [_i286core + cpucore_t.remainclock], ebx
mov ebx, ecx	mov ebx, ecx
cmp ecx, 000a1fffh	cmp ecx, 000a1fffh
jnc short wtramw_a	jnc short wtramw_a
Line 512 wcgwinw_odd: add ebx, dword [_cgwindow	Line 512 wcgwinw_odd: add ebx, dword [_cgwindow
or word [_vramupdate + ebx], 0101h	or word [_vramupdate + ebx], 0101h
or byte [_gdcs + gdcs_t.grphdisp], 1	or byte [_gdcs + gdcs_t.grphdisp], 1
mov ebx, [_vramop + vramop_t.vramwait]	mov ebx, [_vramop + vramop_t.vramwait]
sub [_i286core + i286core_t.remainclock], ebx	sub [_i286core + cpucore_t.remainclock], ebx
pop ebx	pop ebx
ret	ret

Line 524 wcgwinw_odd: add ebx, dword [_cgwindow	Line 524 wcgwinw_odd: add ebx, dword [_cgwindow
or word [_vramupdate + ebx], 0202h	or word [_vramupdate + ebx], 0202h
or byte [_gdcs + gdcs_t.grphdisp], 2	or byte [_gdcs + gdcs_t.grphdisp], 2
mov ebx, [_vramop + vramop_t.vramwait]	mov ebx, [_vramop + vramop_t.vramwait]
sub [_i286core + i286core_t.remainclock], ebx	sub [_i286core + cpucore_t.remainclock], ebx
pop ebx	pop ebx
ret	ret

Line 545 wcgwinw_odd: add ebx, dword [_cgwindow	Line 545 wcgwinw_odd: add ebx, dword [_cgwindow
or byte [_gdcs + gdcs_t.grphdisp], 1	or byte [_gdcs + gdcs_t.grphdisp], 1

grcgw_rmw: mov ebx, [_vramop + vramop_t.grcgwait]	grcgw_rmw: mov ebx, [_vramop + vramop_t.grcgwait]
sub [_i286core + i286core_t.remainclock], ebx	sub [_i286core + cpucore_t.remainclock], ebx
push eax	push eax
mov ebx, dword [_grcg + grcg_t.mode]	mov ebx, dword [_grcg + grcg_t.mode]
mov bx, dx	mov bx, dx
Line 596 grcgwrmw_end: pop eax	Line 596 grcgwrmw_end: pop eax
or byte [_gdcs + gdcs_t.grphdisp], 1	or byte [_gdcs + gdcs_t.grphdisp], 1

grcgw_tdw: mov ebx, [_vramop + vramop_t.grcgwait]	grcgw_tdw: mov ebx, [_vramop + vramop_t.grcgwait]
sub [_i286core + i286core_t.remainclock], ebx	sub [_i286core + cpucore_t.remainclock], ebx
mov ebx, [_grcg + grcg_t.mode]	mov ebx, [_grcg + grcg_t.mode]
test ebx, 010000h	test ebx, 010000h
jne short grcgwtdw_r	jne short grcgwtdw_r
Line 622 grcgwtdw_end: pop ecx	Line 622 grcgwtdw_end: pop ecx
align 16	align 16
@egcw_wt: VRAMTRACE_W	@egcw_wt: VRAMTRACE_W
mov ebx, [_vramop + vramop_t.grcgwait]	mov ebx, [_vramop + vramop_t.grcgwait]
sub [_i286core + i286core_t.remainclock], ebx	sub [_i286core + cpucore_t.remainclock], ebx
pop ebx	pop ebx
%if USE_EGCASM	%if USE_EGCASM
jmp egc_write_w	jmp egc_write_w
Line 640 grcgwtdw_end: pop ecx	Line 640 grcgwtdw_end: pop ecx
and ecx, 3fffh	and ecx, 3fffh
shr ebx, 12	shr ebx, 12
and ebx, byte (3*4)	and ebx, byte (3*4)
add ecx, [_i286core + i286core_t.ems + ebx]	add ecx, [_i286core + cpucore_t.ems + ebx]
mov [EXTMEMORY + ecx], dx	mov [EXTMEMORY + ecx], dx
pop ecx	pop ecx
pop ebx	pop ebx
Line 655 grcgwtdw_end: pop ecx	Line 655 grcgwtdw_end: pop ecx
; normal memory	; normal memory
align 16	align 16
@i286w_rd: mov ebx, ecx	@i286w_rd: mov ebx, ecx
and ebx, [_i286core + i286core_t.adrsmask]	and ebx, [_i286core + cpucore_t.adrsmask]
mov ax, [MAINMEMORY + ebx]	mov ax, [MAINMEMORY + ebx]
pop ebx	pop ebx
ret	ret
Line 663 grcgwtdw_end: pop ecx	Line 663 grcgwtdw_end: pop ecx
; font cg-window	; font cg-window
align 16	align 16
@tramw_rd: mov ebx, [_vramop + vramop_t.tramwait]	@tramw_rd: mov ebx, [_vramop + vramop_t.tramwait]
sub [_i286core + i286core_t.remainclock], ebx	sub [_i286core + cpucore_t.remainclock], ebx
cmp ecx, 0a3fffh	cmp ecx, 0a3fffh
jnc rcgwwindow_s	jnc rcgwwindow_s
mov ax, [MAINMEMORY + ecx]	mov ax, [MAINMEMORY + ecx]
Line 717 rcgwwindow_a4fff: mov ebx, dword [_cgwi	Line 717 rcgwwindow_a4fff: mov ebx, dword [_cgwi
align 16	align 16
@vramw_r0: mov ax, [VIDEOMEMORY + ecx]	@vramw_r0: mov ax, [VIDEOMEMORY + ecx]
mov ebx, [_vramop + vramop_t.vramwait]	mov ebx, [_vramop + vramop_t.vramwait]
sub [_i286core + i286core_t.remainclock], ebx	sub [_i286core + cpucore_t.remainclock], ebx
pop ebx	pop ebx
ret	ret

Line 725 rcgwwindow_a4fff: mov ebx, dword [_cgwi	Line 725 rcgwwindow_a4fff: mov ebx, dword [_cgwi
align 16	align 16
@vramw_r1: mov ax, [VIDEOMEMORY + VRAM_STEP + ecx]	@vramw_r1: mov ax, [VIDEOMEMORY + VRAM_STEP + ecx]
mov ebx, [_vramop + vramop_t.vramwait]	mov ebx, [_vramop + vramop_t.vramwait]
sub [_i286core + i286core_t.remainclock], ebx	sub [_i286core + cpucore_t.remainclock], ebx
pop ebx	pop ebx
ret	ret

Line 740 rcgwwindow_a4fff: mov ebx, dword [_cgwi	Line 740 rcgwwindow_a4fff: mov ebx, dword [_cgwi
and ecx, 7fffh	and ecx, 7fffh

grcgw_tcr: mov ebx, [_vramop + vramop_t.grcgwait]	grcgw_tcr: mov ebx, [_vramop + vramop_t.grcgwait]
sub [_i286core + i286core_t.remainclock], ebx	sub [_i286core + cpucore_t.remainclock], ebx
mov ax, 0	mov ax, 0
mov ebx, [_grcg + grcg_t.mode]	mov ebx, [_grcg + grcg_t.mode]
test ebx, 010000h	test ebx, 010000h
Line 770 grcgwtcr_end: not ax	Line 770 grcgwtcr_end: not ax
; EGC bridge	; EGC bridge
align 16	align 16
@egcw_rd: mov ebx, [_vramop + vramop_t.grcgwait]	@egcw_rd: mov ebx, [_vramop + vramop_t.grcgwait]
sub [_i286core + i286core_t.remainclock], ebx	sub [_i286core + cpucore_t.remainclock], ebx
pop ebx	pop ebx
%if USE_EGCASM	%if USE_EGCASM
jmp egc_read_w	jmp egc_read_w
Line 790 grcgwtcr_end: not ax	Line 790 grcgwtcr_end: not ax
and ecx, 3fffh	and ecx, 3fffh
shr ebx, 12	shr ebx, 12
and ebx, byte (3*4)	and ebx, byte (3*4)
add ecx, [_i286core + i286core_t.ems + ebx]	add ecx, [_i286core + cpucore_t.ems + ebx]
mov ax, [EXTMEMORY + ecx]	mov ax, [EXTMEMORY + ecx]
pop ecx	pop ecx
pop ebx	pop ebx
Line 799 grcgwtcr_end: not ax	Line 799 grcgwtcr_end: not ax
; BIOS or ITF	; BIOS or ITF
align 16	align 16
@i286w_rb: pop ebx	@i286w_rb: pop ebx
cmp byte [_i286core + i286core_t.itfbank], 0	cmp byte [_i286core + cpucore_t.itfbank], 0
jne readwmem_itf	jne readwmem_itf
mov ax, [MAINMEMORY + ecx]	mov ax, [MAINMEMORY + ecx]
ret	ret
Line 1343 memxwrite_lp: mov dl, [esi]	Line 1343 memxwrite_lp: mov dl, [esi]
memxwrite_ed: pop ebx	memxwrite_ed: pop ebx
ret 4	ret 4

ends

RetroPC.NET-CVS <cvs@retropc.net>

Removed from v.1.13
changed lines
	Added in v.1.16