Skip to content

MIPS: fix FPU compile error for ls1bdev #3514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 10, 2020
Merged

MIPS: fix FPU compile error for ls1bdev #3514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ee61d78
MIPS: inline routine should be static here
uselessboard Mar 25, 2020
f295149
MIPS: fix inline assembly for FPU
uselessboard Apr 3, 2020
7f04500
MIPS: ls1bdev: default instruction set MIPSr2
uselessboard Apr 3, 2020
a705e5e
MIPS: ls1bdev: fix a compile error
uselessboard Apr 3, 2020
ab8e5e5
MIPS: ls1bdev: add .gitignore
uselessboard Apr 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added bsp/ls1bdev/.gitignore
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions bsp/ls1bdev/drivers/board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

#include <rtthread.h>
#include <rthw.h>
#include <mips_fpu.h>

#include "board.h"
#include "uart.h"
Expand Down
2 changes: 1 addition & 1 deletion bsp/ls1bdev/rtconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
OBJCPY = PREFIX + 'objcopy'
READELF = PREFIX + 'readelf'

DEVICE = ' -mips32'
DEVICE = ' -mips32r2'
CFLAGS = DEVICE + ' -EL -G0 -mno-abicalls -fno-pic -fno-builtin -fno-exceptions -ffunction-sections -fomit-frame-pointer'
AFLAGS = ' -c' + DEVICE + ' -EL -fno-pic -fno-builtin -mno-abicalls -x assembler-with-cpp'
LFLAGS = DEVICE + ' -nostartfiles -EL -Wl,--gc-sections,-Map=rtthread.map,-cref,-u,Reset_Handler -T ls1b_ram.lds'
Expand Down
4 changes: 2 additions & 2 deletions libcpu/mips/common/mips_fpu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* init hardware FPU
*/
#ifdef RT_USING_FPU
inline void rt_hw_fpu_init(void)
rt_inline void rt_hw_fpu_init(void)
{
rt_uint32_t c0_status = 0;
rt_uint32_t c1_status = 0;
Expand All @@ -38,7 +38,7 @@ inline void rt_hw_fpu_init(void)
return ;
}
#else
inline void rt_hw_fpu_init(void){} /* Do nothing */
rt_inline void rt_hw_fpu_init(void){} /* Do nothing */
#endif

#endif
Expand Down
6 changes: 3 additions & 3 deletions libcpu/mips/common/mips_regs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -999,7 +999,7 @@ do { \

#define write_32bit_cp0_set1_register(register,value) \
__asm__ __volatile__( \
"ctc0\t%0,"STR(register)"\n\t" \
"ctc0\t%0,$"STR(register)"\n\t" \
"nop" \
: : "r" (value));

Expand Down Expand Up @@ -1037,14 +1037,14 @@ do { \
__asm__ __volatile__( \
".set\tpush\n\t" \
".set\treorder\n\t" \
"cfc1\t%0,"STR(source)"\n\t" \
"cfc1\t%0,$"STR(source)"\n\t" \
".set\tpop" \
: "=r" (__res)); \
__res;})

#define write_32bit_cp1_register(register,value) \
__asm__ __volatile__( \
"ctc1\t%0,"STR(register)"\n\t" \
"ctc1\t%0,$"STR(register)"\n\t" \
"nop" \
: : "r" (value));

Expand Down