Skip to content

Commit 91d530e

Browse files
winlinvipwinlinvip
committed
Fix #11, Support OSX for Apple Darwin, macOS
1 parent f9a13a8 commit 91d530e

File tree

5 files changed

+105
-17
lines changed

5 files changed

+105
-17
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ DARWIN_*_DBG
22
LINUX_*_DBG
33
obj
44
st.pc
5+
.idea

‎Makefile

+9-3
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ OTHER_FLAGS = -Wall
128128
endif
129129

130130
ifeq ($(OS), DARWIN)
131+
EXTRA_OBJS = $(TARGETDIR)/md_darwin.o
131132
LD = cc
132133
SFLAGS = -fPIC -fno-common
133134
DSO_SUFFIX = dylib
@@ -139,8 +140,8 @@ CFLAGS += -arch ppc
139140
LDFLAGS += -arch ppc
140141
endif
141142
ifeq ($(INTEL), yes)
142-
CFLAGS += -arch i386 -arch x86_64
143-
LDFLAGS += -arch i386 -arch x86_64
143+
CFLAGS += -arch x86_64
144+
LDFLAGS += -arch x86_64
144145
endif
145146
LDFLAGS += -dynamiclib -install_name /sw/lib/libst.$(MAJOR).$(DSO_SUFFIX) -compatibility_version $(MAJOR) -current_version $(VERSION)
146147
OTHER_FLAGS = -Wall
@@ -313,7 +314,9 @@ endif
313314
# for SRS
314315
# disable examples for ubuntu crossbuild failed.
315316
# @see https://github.com/winlinvip/simple-rtmp-server/issues/308
317+
ifeq ($(OS), LINUX)
316318
EXAMPLES =
319+
endif
317320

318321
ifeq ($(OS), DARWIN)
319322
LINKNAME = libst.$(DSO_SUFFIX)
@@ -369,10 +372,13 @@ $(HEADER): public.h
369372
$(TARGETDIR)/md.o: md.S
370373
$(CC) $(CFLAGS) -c $< -o $@
371374

375+
$(TARGETDIR)/md_darwin.o: md_darwin.S
376+
$(CC) $(CFLAGS) -c $< -o $@
377+
372378
$(TARGETDIR)/%.o: %.c common.h md.h
373379
$(CC) $(CFLAGS) -c $< -o $@
374380

375-
examples::
381+
examples: $(SLIBRARY)
376382
@echo Making $@
377383
@cd $@; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" OS="$(OS)" TARGETDIR="$(TARGETDIR)"
378384

‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ The branch [srs](https://github.com/ossrs/state-threads/tree/srs) will be patche
2222
- [x] Patch [st.osx10.14.build.patch](https://github.com/ossrs/srs/blob/2.0release/trunk/3rdparty/patches/6.st.osx10.14.build.patch), for osx 10.14 build.
2323
- [x] Support macro `MD_ST_NO_ASM` to disable ASM, [#8](https://github.com/ossrs/state-threads/issues/8).
2424
- [x] Merge patch [srs#1282](https://github.com/ossrs/srs/issues/1282#issuecomment-445539513) to support aarch64, [#9](https://github.com/ossrs/state-threads/issues/9).
25+
- [x] Support OSX for Apple Darwin, macOS, [#11](https://github.com/ossrs/state-threads/issues/11).
2526

2627
## Docs
2728

‎md.h

+18-14
Original file line numberDiff line numberDiff line change
@@ -120,26 +120,30 @@
120120
#define MD_ALWAYS_UNSERIALIZED_ACCEPT
121121
#define MD_HAVE_SOCKLEN_T
122122

123-
#define MD_SETJMP(env) _setjmp(env)
124-
#define MD_LONGJMP(env, val) _longjmp(env, val)
123+
#define MD_USE_BUILTIN_SETJMP
125124

126-
#if defined(__ppc__)
127-
#define MD_JB_SP 0
128-
#elif defined(__i386__)
129-
#define MD_JB_SP 9
130-
#elif defined(__x86_64__)
131-
#define MD_JB_SP 4
125+
#if defined(__amd64__) || defined(__x86_64__)
126+
#define JB_SP 12
127+
#define MD_GET_SP(_t) *((long *)&((_t)->context[JB_SP]))
132128
#else
133129
#error Unknown CPU architecture
134130
#endif
135-
136-
#define MD_INIT_CONTEXT(_thread, _sp, _main) \
137-
ST_BEGIN_MACRO \
138-
if (MD_SETJMP((_thread)->context)) \
139-
_main(); \
140-
*((long *)&((_thread)->context[MD_JB_SP])) = (long) (_sp); \
131+
132+
#define MD_INIT_CONTEXT(_thread, _sp, _main) \
133+
ST_BEGIN_MACRO \
134+
if (MD_SETJMP((_thread)->context)) \
135+
_main(); \
136+
MD_GET_SP(_thread) = (long) (_sp); \
141137
ST_END_MACRO
142138

139+
#if defined(MD_USE_BUILTIN_SETJMP)
140+
#define MD_SETJMP(env) _st_md_cxt_save(env)
141+
#define MD_LONGJMP(env, val) _st_md_cxt_restore(env, val)
142+
143+
extern int _st_md_cxt_save(jmp_buf env);
144+
extern void _st_md_cxt_restore(jmp_buf env, int val);
145+
#endif
146+
143147
#define MD_GET_UTIME() \
144148
struct timeval tv; \
145149
(void) gettimeofday(&tv, NULL); \

‎md_darwin.S

+76
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
2+
/* If user disable the ASM, such as avoiding bugs in ASM, donot compile it. */
3+
#if !defined(MD_ST_NO_ASM)
4+
5+
#if defined(__amd64__) || defined(__x86_64__)
6+
7+
/****************************************************************/
8+
9+
/*
10+
* Internal __jmp_buf layout
11+
*/
12+
#define JB_RBX 0
13+
#define JB_RBP 1
14+
#define JB_R12 2 /* Backup IP, https://www.cnblogs.com/Five100Miles/p/8458561.html */
15+
#define JB_R13 3 /* Backup SP, https://www.cnblogs.com/Five100Miles/p/8458561.html */
16+
#define JB_R14 4 /* Backup LR, https://www.cnblogs.com/Five100Miles/p/8458561.html */
17+
#define JB_R15 5 /* Backup PC, https://www.cnblogs.com/Five100Miles/p/8458561.html */
18+
#define JB_RSP 6
19+
#define JB_PC 7
20+
21+
.file "md_darwin.S"
22+
.text
23+
24+
/* _st_md_cxt_save(__jmp_buf env) */ /* The env is rdi, http://blog.chinaunix.net/uid-20157960-id-1974354.html */
25+
.globl __st_md_cxt_save
26+
.align 16
27+
__st_md_cxt_save:
28+
/*
29+
* Save registers.
30+
*/
31+
movq %rbx, (JB_RBX*8)(%rdi) /* Save rbx to env[0], *(int64_t*)(rdi+0)=rbx */
32+
movq %rbp, (JB_RBP*8)(%rdi) /* Save rbp to env[1], *(int64_t*)(rdi+1)=rbp */
33+
movq %r12, (JB_R12*8)(%rdi) /* Save r12 to env[2], *(int64_t*)(rdi+2)=r12 */
34+
movq %r13, (JB_R13*8)(%rdi) /* Save r13 to env[3], *(int64_t*)(rdi+3)=r13 */
35+
movq %r14, (JB_R14*8)(%rdi) /* Save r14 to env[4], *(int64_t*)(rdi+4)=r14 */
36+
movq %r15, (JB_R15*8)(%rdi) /* Save r15 to env[5], *(int64_t*)(rdi+5)=r15 */
37+
/* Save SP */
38+
leaq 8(%rsp), %rdx /* Save *(int64_t*)(rsp+8) to rdx, https://my.oschina.net/guonaihong/blog/508907 */
39+
movq %rdx, (JB_RSP*8)(%rdi) /* Save rdx(rsp) to env[6], *(int64_t*)(rdi+6)=rdx */
40+
/* Save PC we are returning to */
41+
movq (%rsp), %rax /* Save PC(parent function address) %(rsp) to rax */
42+
movq %rax, (JB_PC*8)(%rdi) /* Save rax(PC) to env[7], *(int64_t*)(rdi+7)=rax */
43+
xorq %rax, %rax /* Reset rax to 0 */
44+
ret
45+
46+
47+
/****************************************************************/
48+
49+
/* _st_md_cxt_restore(__jmp_buf env, int val) */ /* The env is rdi, val is esi/rsi, http://blog.chinaunix.net/uid-20157960-id-1974354.html */
50+
.globl __st_md_cxt_restore
51+
.align 16
52+
__st_md_cxt_restore:
53+
/*
54+
* Restore registers.
55+
*/
56+
movq (JB_RBX*8)(%rdi), %rbx /* Load rbx from env[0] */
57+
movq (JB_RBP*8)(%rdi), %rbp /* Load rbp from env[1] */
58+
movq (JB_R12*8)(%rdi), %r12 /* Load r12 from env[2] */
59+
movq (JB_R13*8)(%rdi), %r13 /* Load r13 from env[3] */
60+
movq (JB_R14*8)(%rdi), %r14 /* Load r14 from env[4] */
61+
movq (JB_R15*8)(%rdi), %r15 /* Load r15 from env[5] */
62+
/* Set return value */ /* The esi is param1 val, the eax is return value */
63+
test %esi, %esi /* if (!val) { */
64+
mov $01, %eax /* val=1; */
65+
cmove %eax, %esi /* } */
66+
mov %esi, %eax /* return val; */
67+
movq (JB_PC*8)(%rdi), %rdx /* Load rdx(PC) from env[7] */
68+
movq (JB_RSP*8)(%rdi), %rsp /* Load rsp from env[6] */
69+
/* Jump to saved PC */
70+
jmpq *%rdx /* Jump to rdx(PC) */
71+
72+
/****************************************************************/
73+
74+
#endif
75+
76+
#endif

0 commit comments

Comments
 (0)