diff --git a/common.mk b/common.mk index 76faa7a..d5f3783 100644 --- a/common.mk +++ b/common.mk @@ -50,7 +50,7 @@ SYS_IP_OBJ += $(LIB)/smpsys.o $< $@ %.elf: - $(LD) --print-memory-usage -T $(LIB)/sh2.lds $^ -o $@ + $(LD) --no-warn-rwx-segment --print-memory-usage -T $(LIB)/sh2.lds $^ -o $@ sys_ip.elf: $(SYS_IP_OBJ) $(LD) --print-memory-usage -T $(LIB)/sys_ip.lds $^ -o $@ diff --git a/segasmp/lib/sys_area.o b/segasmp/lib/sys_area.o old mode 100755 new mode 100644 diff --git a/segasmp/lib/sys_areb.o b/segasmp/lib/sys_areb.o old mode 100755 new mode 100644 diff --git a/segasmp/lib/sys_arek.o b/segasmp/lib/sys_arek.o old mode 100755 new mode 100644 diff --git a/segasmp/lib/sys_arel.o b/segasmp/lib/sys_arel.o old mode 100755 new mode 100644 diff --git a/sh2.lds b/sh2.lds index d7b2fac..3e026b7 100644 --- a/sh2.lds +++ b/sh2.lds @@ -12,13 +12,14 @@ SECTIONS .text ALIGN(4) : SUBALIGN(4) { *(.text.start) - *(.text*) + *(.text) *(.text.*) } > work_ram_h .data ALIGN(4) : SUBALIGN(4) { *(.data) + *(.data.*) } > work_ram_h .rodata ALIGN(4) : SUBALIGN(4) diff --git a/vdp2.h b/vdp2.h index 4911de9..5c93c29 100644 --- a/vdp2.h +++ b/vdp2.h @@ -231,8 +231,14 @@ enum vrsize_bit { // }; // enum vcnt_bit { // }; -// enum ramctl_bit { -// }; +enum ramctl_bit { + RAMCTL__CRKTE = (1 << 15), + RAMCTL__VRBMD = (1 << 9), + RAMCTL__VRAMD = (1 << 8), + RAMCTL__CRMD__RGB_5BIT_1024 = (0b00 << 12), + RAMCTL__CRMD__RGB_5BIT_2048 = (0b01 << 12), + RAMCTL__CRMD__RGB_8BIT_1024 = (0b10 << 12) +}; // enum cyca0l_bit { // }; // enum cyca0u_bit { @@ -272,7 +278,7 @@ enum bgon_bit { enum chctla_bit { CHCTLA__N1CHCN__16_COLOR = (0b00 << 12), CHCTLA__N1CHCN__256_COLOR = (0b00 << 12), - CHCTLA__N1CHCN__2K_COLOR = (0b00 << 12), + CHCTLA__N1CHCN__2048_COLOR = (0b00 << 12), CHCTLA__N1CHCN__32K_COLOR = (0b00 << 12), CHCTLA__N1BMSZ__512x256_DOT = (0b00 << 10), @@ -288,7 +294,7 @@ enum chctla_bit { CHCTLA__N0CHCN__16_COLOR = (0b000 << 4), CHCTLA__N0CHCN__256_COLOR = (0b001 << 4), - CHCTLA__N0CHCN__2K_COLOR = (0b010 << 4), + CHCTLA__N0CHCN__2048_COLOR = (0b010 << 4), CHCTLA__N0CHCN__32K_COLOR = (0b011 << 4), CHCTLA__N0CHCN__16M_COLOR = (0b100 << 4), @@ -306,7 +312,7 @@ enum chctla_bit { enum chctlb_bit { CHCTLB__R0CHCN__16_COLOR = (0b000 << 12), CHCTLB__R0CHCN__256_COLOR = (0b001 << 12), - CHCTLB__R0CHCN__2K_COLOR = (0b010 << 12), + CHCTLB__R0CHCN__2048_COLOR = (0b010 << 12), CHCTLB__R0CHCN__32K_COLOR = (0b011 << 12), CHCTLB__R0CHCN__16M_COLOR = (0b100 << 12),