mirror
/
ClassiCube
mirror of https://github.com/ClassiCube/ClassiCube
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1454 from a1batross/master 

Add support for Elbrus architecture
This commit is contained in:
UnknownShadow200 2025-10-28 12:00:44 +11:00 committed by GitHub
parent d00fb4b333 2d4d6e6689
commit 968396b99b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -25,6 +25,8 @@ TRACK_DEPENDENCIES=1
LINK = $(CC)
# Whether to add BearSSL source files to list of files to compile
BEARSSL=1
# Optimization level in release builds
OPT_LEVEL=1
#################################################################
@ -79,6 +81,11 @@ endif
ifeq ($(PLAT),linux)
LIBS = -lX11 -lXi -lpthread -lGL -ldl
BUILD_DIR = build/linux
# Detect MCST LCC, where -O3 is about equivalent to -O1
ifeq ($(shell $(CC) -dM -E -xc - < /dev/null | grep -o __MCST__),__MCST__)
OPT_LEVEL=3
endif
endif
ifeq ($(PLAT),sunos)
@ -201,7 +208,7 @@ ifeq ($(BEARSSL),1)
endif
ifdef RELEASE
CFLAGS += -O1
CFLAGS += -O$(OPT_LEVEL)
else
CFLAGS += -g
endif

13
src/Logger.c
View File

@ -578,6 +578,10 @@ String_Format4(str, "r12=%x r13=%x r14=%x r15=%x" _NL, REG_GNUM(12), REG_GNUM(13
String_Format3(str, "mal=%x mah=%x gbr=%x" _NL, REG_GET_MACL(), REG_GET_MACH(), REG_GET_GBR()); \
String_Format2(str, "pc =%x ra =%x" _NL, REG_GET_PC(), REG_GET_RA());
#define Dump_E2K() \
String_Format4(str, "ps =%x pcs=%x sbr=%x usd=%x" _NL, REG_GET_PSP(), REG_GET_PCSP(), REG_GET_SBR(), REG_GET_USD()); \
String_Format1(str, "ip =%x" _NL, REG_GET_IP());
#if defined CC_BUILD_WIN
/* See CONTEXT in WinNT.h */
static void PrintRegisters(cc_string* str, void* ctx) {
@ -694,6 +698,8 @@ static void PrintRegisters(cc_string* str, void* ctx) {
#if __PPC__ && __WORDSIZE == 32
/* See sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h in glibc */
mcontext_t* r = ((ucontext_t*)ctx)->uc_mcontext.uc_regs;
#elif __e2k__
struct sigcontext* r = &((ucontext_t*)ctx)->uc_mcontext;
#else
mcontext_t* r = &((ucontext_t*)ctx)->uc_mcontext;
#endif
@ -752,6 +758,13 @@ static void PrintRegisters(cc_string* str, void* ctx) {
#define REG_GNUM(num) &r->__gregs[num]
#define REG_GET_PC() &r->__gregs[REG_PC]
Dump_RISCV()
#elif defined __e2k__
#define REG_GET_PSP() &r->psp_hi /* Procedure Stack Pointer */
#define REG_GET_PCSP() &r->pcsp_hi /* Procedure Chain Stack Pointer */
#define REG_GET_SBR() &r->sbr /* User Stack Base Pointer */
#define REG_GET_USD() &r->usd_hi /* User Stack Pointer */
#define REG_GET_IP() &r->cr0_hi /* CR0 contains Instruction Pointer */
Dump_E2K()
#else
#error "Unknown CPU architecture"
#endif