Skip to content
Snippets Groups Projects
Commit f4abb176 authored by Roberto Hexsel's avatar Roberto Hexsel
Browse files

improved cMIPS.ld

parent 5b891111
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 46 additions and 127 deletions
cMIPS/bin/assemble.sh
+ 1
− 1
View file @ f4abb176
...@@ -112,7 +112,7 @@ bin=prog.bin ...@@ -112,7 +112,7 @@ bin=prog.bin
dat=data.bin dat=data.bin
(mips-as -O${level} -EL -mips32r2 -I "${include}" -o $obj $asm || exit 1) &&\ (mips-as -O${level} -EL -mips32r2 -I "${include}" -o $obj $asm || exit 1) &&\
mips-ld -EL -e _start ${mem_map} -I "${include}" --script $c_ld -o $elf $obj &&\ mips-ld -EL ${mem_map} -I "${include}" --script $c_ld -o $elf $obj &&\
mips-objcopy -S -j .text -O binary $elf $bin &&\ mips-objcopy -S -j .text -O binary $elf $bin &&\
mips-objcopy -S -j .data -j .rodata -O binary $elf $dat &&\ mips-objcopy -S -j .data -j .rodata -O binary $elf $dat &&\
chmod a-x $bin $dat &&\ chmod a-x $bin $dat &&\
......
cMIPS/bin/compile.sh
+ 1
− 3
View file @ f4abb176
...@@ -108,7 +108,6 @@ c_s="${include}"/cMIPS.s ...@@ -108,7 +108,6 @@ c_s="${include}"/cMIPS.s
c_io="${include}"/cMIPSio c_io="${include}"/cMIPSio
# c_start="${include}"/start ## see below for synthesis version # c_start="${include}"/start ## see below for synthesis version
c_hndlrs="${include}"/handlers c_hndlrs="${include}"/handlers
c_stop="${include}"/stop
pkg_vhd="${srcVHDL}"/packageMemory.vhd pkg_vhd="${srcVHDL}"/packageMemory.vhd
...@@ -141,10 +140,9 @@ mips-gcc -O1 -DcMIPS -mno-gpopt -I"${include}" -S ${c_io}.c -o ${c_io}.s $S &&\ ...@@ -141,10 +140,9 @@ mips-gcc -O1 -DcMIPS -mno-gpopt -I"${include}" -S ${c_io}.c -o ${c_io}.s $S &&\
mips-as -O1 -EL -mips32 -I "${include}" -o ${obj} ${asm} && \ mips-as -O1 -EL -mips32 -I "${include}" -o ${obj} ${asm} && \
mips-as -O1 -EL -mips32 -I "${include}" -o ${c_start}.o ${c_start}.s && \ mips-as -O1 -EL -mips32 -I "${include}" -o ${c_start}.o ${c_start}.s && \
mips-as -O1 -EL -mips32 -I "${include}" -o ${c_hndlrs}.o ${c_hndlrs}.s && \ mips-as -O1 -EL -mips32 -I "${include}" -o ${c_hndlrs}.o ${c_hndlrs}.s && \
mips-as -O1 -EL -mips32 -I "${include}" -o ${c_stop}.o ${c_stop}.s && \
mips-as -O1 -EL -mips32 -I "${include}" -o ${c_io}.o ${c_io}.s && \ mips-as -O1 -EL -mips32 -I "${include}" -o ${c_io}.o ${c_io}.s && \
mips-ld -EL -e _start ${memory_map} -I "${include}" --script $c_ld \ mips-ld -EL -e _start ${memory_map} -I "${include}" --script $c_ld \
-o $elf ${c_start}.o ${c_hndlrs}.o ${c_io}.o $obj ${c_stop}.o || exit 1 -o $elf ${c_start}.o ${c_hndlrs}.o ${c_io}.o $obj || exit 1
mips-objcopy -S -j .text -O binary $elf $bin && \ mips-objcopy -S -j .text -O binary $elf $bin && \
mips-objcopy -S -j .data -j .rodata -j .rodata1 -j .data1 \ mips-objcopy -S -j .data -j .rodata -j .rodata1 -j .data1 \
......
cMIPS/bin/elf2mif.sh
+ 12
− 2
View file @ f4abb176
...@@ -49,6 +49,9 @@ x_ROM_BASE=$(sed -n '/x_INST_BASE_ADDR/s/.*:= x"\(.*\)".*$/\1/p' $tree/vhdl/pack ...@@ -49,6 +49,9 @@ x_ROM_BASE=$(sed -n '/x_INST_BASE_ADDR/s/.*:= x"\(.*\)".*$/\1/p' $tree/vhdl/pack
ROM_BASE=$((16#$x_ROM_BASE)) ROM_BASE=$((16#$x_ROM_BASE))
x_ROM_SIZE=$(sed -n '/x_INST_MEM_SZ/s/.*:= x"\(.*\)".*$/\1/p' $tree/vhdl/packageMemory.vhd)
ROM_SZ=$((16#$x_ROM_SIZE))
mif=ROM.mif mif=ROM.mif
...@@ -56,7 +59,7 @@ mips-objdump -z -D -EL --section .text $elf |\ ...@@ -56,7 +59,7 @@ mips-objdump -z -D -EL --section .text $elf |\
sed -e '1,6d' -e '/^$/d' -e '/^ /!d' -e 's:\t: :g' -e 's#^ *\([a-f0-9]*\): *\(........\) *\(.*\)$#\2;#' |\ sed -e '1,6d' -e '/^$/d' -e '/^ /!d' -e 's:\t: :g' -e 's#^ *\([a-f0-9]*\): *\(........\) *\(.*\)$#\2;#' |\
awk 'BEGIN{c='$ROM_BASE';} //{ printf "%d : %s\n",c,$1 ; c=c+1; }' > xxxx awk 'BEGIN{c='$ROM_BASE';} //{ printf "%d : %s\n",c,$1 ; c=c+1; }' > xxxx
echo -e "\n-- cMIPS code\n\nDEPTH=4096;\nWIDTH=32;\n\n" > $mif echo -e "\n-- cMIPS code\n\nDEPTH=${ROM_SZ};\nWIDTH=32;\n" > $mif
echo -e "ADDRESS_RADIX=DEC;\nDATA_RADIX=HEX;\nCONTENT BEGIN" >> $mif echo -e "ADDRESS_RADIX=DEC;\nDATA_RADIX=HEX;\nCONTENT BEGIN" >> $mif
cat xxxx >> $mif cat xxxx >> $mif
echo "END;" >> $mif echo "END;" >> $mif
...@@ -64,17 +67,24 @@ echo "END;" >> $mif ...@@ -64,17 +67,24 @@ echo "END;" >> $mif
rm -f xxxx rm -f xxxx
x_RAM_BASE=$(sed -n '/x_DATA_BASE_ADDR/s/.*:= x"\(.*\)".*$/\1/p' $tree/vhdl/packageMemory.vhd) x_RAM_BASE=$(sed -n '/x_DATA_BASE_ADDR/s/.*:= x"\(.*\)".*$/\1/p' $tree/vhdl/packageMemory.vhd)
RAM_BASE=$((16#$x_RAM_BASE)) RAM_BASE=$((16#$x_RAM_BASE))
x_RAM_SIZE=$(sed -n '/x_DATA_MEM_SZ/s/.*:= x"\(.*\)".*$/\1/p' $tree/vhdl/packageMemory.vhd)
RAM_SZ=$((16#$x_RAM_SIZE))
mif=RAM.mif mif=RAM.mif
mips-objdump -z -D -EL --section .data --section .rodata --section rodata1 --section .data1 --section .sdata --section .lit8 --section .lit4 --section .sbss --section .bss $elf |\ mips-objdump -z -D -EL --section .data --section .rodata --section rodata1 --section .data1 --section .sdata --section .lit8 --section .lit4 --section .sbss --section .bss $elf |\
sed -e '1,6d' -e '/^$/d' -e '/^ /!d' -e 's:\t: :g' -e 's#^ *\([a-f0-9]*\): *\(........\) *\(.*\)$#\2;#' |\ sed -e '1,6d' -e '/^$/d' -e '/^ /!d' -e 's:\t: :g' -e 's#^ *\([a-f0-9]*\): *\(........\) *\(.*\)$#\2;#' |\
awk 'BEGIN{c='$RAM_BASE';} //{ printf "%d : %s\n",c,$1 ; c=c+1; }' > xxxx awk 'BEGIN{c='$RAM_BASE';} //{ printf "%d : %s\n",c,$1 ; c=c+1; }' > xxxx
echo -e "\n-- cMIPS data\n\nDEPTH=4096;\nWIDTH=32;\n\n" > $mif echo -e "\n-- cMIPS data\n\nDEPTH=${RAM_SZ};\nWIDTH=32;\n" > $mif
echo -e "ADDRESS_RADIX=DEC;\nDATA_RADIX=HEX;\nCONTENT BEGIN" >> $mif echo -e "ADDRESS_RADIX=DEC;\nDATA_RADIX=HEX;\nCONTENT BEGIN" >> $mif
cat xxxx >> $mif cat xxxx >> $mif
echo "END;" >> $mif echo "END;" >> $mif
......
cMIPS/docs/cMIPS.pdf
+ 0
− 0
View file @ f4abb176
No preview for this file type
cMIPS/include/cMIPS.ld
+ 20
− 4
View file @ f4abb176
OUTPUT_ARCH(mips)
ENTRY(_start)
SECTIONS SECTIONS
{ {
. = 0x00000000; /* x_INST_BASE_ADDR */ . = 0x00000000; /* x_INST_BASE_ADDR */
.text : { *(.text .text.*) } .text :
{
*(.text .text.*)
_etext = . ; /* end of text constant (from Xinu) */
}
. = 0x00040000; /* x_DATA_BASE_ADDR */ . = 0x00040000; /* x_DATA_BASE_ADDR */
.data : { *(.data .data.*) }
.rodata : { *(.rodata .rodata.*) } .rodata : { *(.rodata .rodata.*) }
.rodata1 : { *(.rodata1) } .rodata1 : { *(.rodata1) }
.data :
{
*(.data .data.*)
_edata = . ; /* end of data constant (from Xinu) */
}
.data1 : { *(.data1) } .data1 : { *(.data1) }
.sdata : { *(.sdata .sdata.*) } .sdata : { *(.sdata .sdata.*) }
.lit8 : { *(.lit8) } .lit8 : { *(.lit8) }
.lit4 : { *(.lit4) } .lit4 : { *(.lit4) }
.sbss : { *(.sbss .sbss.*) *(.scommon .scommon.*) } .sbss : { *(.sbss .sbss.*) *(.scommon .scommon.*) }
.bss : { *(.bss .bss.*) *(COMMON) } .bss :
} {
*(.bss .bss.*) *(COMMON)
_end = . ; /* end of image constant (from Xinu) */
}
}
cMIPS/include/cMIPS.s
+ 2
− 2
View file @ f4abb176
# see vhdl/packageMemory.vhd for addresses # see vhdl/packageMemory.vhd for addresses
.set x_INST_BASE_ADDR,0x00000000 .set x_INST_BASE_ADDR,0x00000000
.set x_INST_MEM_SZ,0x00008000 .set x_INST_MEM_SZ,0x00002000
.set x_DATA_BASE_ADDR,0x00040000 .set x_DATA_BASE_ADDR,0x00040000
.set x_DATA_MEM_SZ,0x00008000 .set x_DATA_MEM_SZ,0x00002000
.set x_IO_BASE_ADDR,0x0F000000 .set x_IO_BASE_ADDR,0x0F000000
.set x_IO_MEM_SZ,0x00002000 .set x_IO_MEM_SZ,0x00002000
......
cMIPS/include/stop.s deleted 100644 → 0
+ 0
− 4
View file @ 5b891111
.section .bss,"aw",@nobits
.align 3
.global _highmem
.comm _highmem 4
cMIPS/tests/mac_intRam.s
+ 8
− 4
View file @ f4abb176
...@@ -269,10 +269,14 @@ loop2: sb $9, 0($8) # store char ...@@ -269,10 +269,14 @@ loop2: sb $9, 0($8) # store char
endT2: la $15, HW_dsp7seg_addr # 7 segment display endT2: la $15, HW_dsp7seg_addr # 7 segment display
li $16, 0x04 li $16, 0x04
sw $16, 0($15) # write to 7 segment display
nop
endAll: j endAll # wait forever endAll: sw $16, 0($15) # write to 7 segment display
la $4, wait_1_sec # wait ONE second
jal delay
addi $16, $16,1
j endAll # wait forever
nop nop
#---------------------------------------------------------------------- #----------------------------------------------------------------------
......
cMIPS/tests/mac_kbd_lcd.s deleted 100644 → 0
+ 0
− 105
View file @ 5b891111
.file 1 "mac_kbd_lcd.c"
.section .mdebug.abi32
.previous
.nan legacy
.module fp=32
.module nooddspreg
.text
.align 2
.globl main
.set nomips16
.set nomicromips
.ent main
.type main, @function
main:
.frame $sp,32,$31 # vars= 0, regs= 4/0, args= 16, gp= 0
.mask 0x80070000,-4
.fmask 0x00000000,0
.set noreorder
.set nomacro
addiu $sp,$sp,-32
sw $31,28($sp)
sw $18,24($sp)
sw $17,20($sp)
jal LCDinit
sw $16,16($sp)
jal LCDtopLine
li $17,-1 # 0xffffffffffffffff
jal LCDput
li $4,32 # 0x20
jal LCDput
li $4,72 # 0x48
jal LCDput
li $4,101 # 0x65
jal LCDput
li $4,108 # 0x6c
jal LCDput
li $4,108 # 0x6c
jal LCDput
li $4,111 # 0x6f
jal LCDput
li $4,32 # 0x20
jal LCDput
li $4,119 # 0x77
jal LCDput
li $4,111 # 0x6f
jal LCDput
li $4,114 # 0x72
jal LCDput
li $4,108 # 0x6c
jal LCDput
li $4,100 # 0x64
jal LCDput
li $4,33 # 0x21
jal LCDbotLine
li $18,12451840 # 0xbe0000
ori $18,$18,0xbc20
$L2:
jal KBDget
nop
beq $2,$17,$L2
move $16,$2
move $7,$0
move $6,$0
li $5,1 # 0x1
jal DSP7SEGput
move $4,$2
jal LCDput
addiu $4,$16,48
jal cmips_delay
move $4,$18
li $7,1 # 0x1
move $6,$16
move $5,$0
jal DSP7SEGput
move $4,$0
b $L2
nop
.set macro
.set reorder
.end main
.size main, .-main
.ident "GCC: (GNU) 5.1.0"
cMIPS/vhdl/tb_cMIPS.vhd
+ 2
− 2
View file @ f4abb176
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment