summaryrefslogblamecommitdiff
path: root/system/libucontext/powerpc.patch
blob: ed7604d7bac3e5ce4e287bd81a78671bcf06cc14 (plain) (tree)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
























































































































































































































































































































































































































































































































































                                                                                               





































































































































































































































































































































































































































































































































































































                                                                                               
From 94216c60c43a30e39fbc4f347450768699c6c77c Mon Sep 17 00:00:00 2001
From: Bobby Bingham <koorogi@koorogi.info>
Date: Mon, 1 Apr 2019 23:02:12 -0500
Subject: [PATCH] test ability to pass 10 args through makecontext

---
 test_libucontext.c | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/test_libucontext.c b/test_libucontext.c
index 121cc3e..e5eac83 100644
--- a/test_libucontext.c
+++ b/test_libucontext.c
@@ -6,13 +6,32 @@
 #include <stdio.h>
 #include <ucontext.h>
 #include <stdint.h>
+#include <stdlib.h>
 #include <string.h>
 
 
 static ucontext_t ctx[3];
 
 
-static void f1 (void) {
+static void check_arg(int actual, int expected) {
+	if (actual == expected) return;
+	fprintf(stderr, "argument has wrong value.  got %d, expected %d.\n", actual, expected);
+	abort();
+}
+
+
+static void f1 (int a, int b, int c, int d, int e, int f, int g, int h, int i, int j) {
+	check_arg(a, 1);
+	check_arg(b, 2);
+	check_arg(c, 3);
+	check_arg(d, 4);
+	check_arg(e, 5);
+	check_arg(f, 6);
+	check_arg(g, 7);
+	check_arg(h, 8);
+	check_arg(i, 9);
+	check_arg(j, 10);
+
 	printf("start f1\n");
 	swapcontext(&ctx[1], &ctx[2]);
 	printf("finish f1\n");
@@ -40,7 +59,7 @@ int main (int argc, const char *argv[]) {
 	ctx[1].uc_stack.ss_sp = st1;
 	ctx[1].uc_stack.ss_size = sizeof st1;
 	ctx[1].uc_link = &ctx[0];
-	makecontext(&ctx[1], f1, 0);
+	makecontext(&ctx[1], f1, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
 
 
 	getcontext(&ctx[2]);
From cb59e7ee957b389578a3f973484ae3198f6cfed1 Mon Sep 17 00:00:00 2001
From: Bobby Bingham <koorogi@koorogi.info>
Date: Mon, 1 Apr 2019 23:03:21 -0500
Subject: [PATCH] test calls to getcontext without makecontext

---
 test_libucontext.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/test_libucontext.c b/test_libucontext.c
index e5eac83..a4a9b4c 100644
--- a/test_libucontext.c
+++ b/test_libucontext.c
@@ -48,6 +48,7 @@ static void f2 (void) {
 int main (int argc, const char *argv[]) {
 	char st1[8192];
 	char st2[8192];
+	volatile int done = 0;
 
 
 	/* poison each coroutine's stack memory for debugging purposes */
@@ -70,5 +71,16 @@ int main (int argc, const char *argv[]) {
 
 
 	swapcontext(&ctx[0], &ctx[2]);
+
+
+	/* test ability to use getcontext/setcontext without makecontext */
+	getcontext(&ctx[1]);
+	printf("done = %d\n", done);
+	if (done++ == 0) setcontext(&ctx[1]);
+	if (done != 2) {
+		fprintf(stderr, "wrong value for done.  got %d, expected 2\n", done);
+		abort();
+	}
+
 	return 0;
 }
From b6a9b5e279123f16569e0fd9f8ff14ff04bed7a3 Mon Sep 17 00:00:00 2001
From: Bobby Bingham <koorogi@koorogi.info>
Date: Fri, 5 Apr 2019 13:32:03 -0500
Subject: [PATCH] ppc32: fix stack alignment

The stack should be 16-byte aligned, not 8 mod 16.
---
 arch/ppc/makecontext.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/ppc/makecontext.c b/arch/ppc/makecontext.c
index c562ea5..1b9efdf 100644
--- a/arch/ppc/makecontext.c
+++ b/arch/ppc/makecontext.c
@@ -37,7 +37,7 @@ __makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
 
 	sp = (greg_t *) ((uintptr_t) ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size);
 	sp -= (uc_link + 1);
-	sp = (greg_t *) (((uintptr_t) sp & -16L) - 8);
+	sp = (greg_t *) ((uintptr_t) sp & -16L);
 
 	ucp->uc_mcontext.gregs[REG_NIP]  = (uintptr_t) func;
 	ucp->uc_mcontext.gregs[REG_LNK]  = (uintptr_t) &__start_context;
From b9bd4045fb34f060d6cf37fc7da7ab13b91462de Mon Sep 17 00:00:00 2001
From: Bobby Bingham <koorogi@koorogi.info>
Date: Fri, 5 Apr 2019 13:35:00 -0500
Subject: [PATCH] ppc32/64: fix back chain pointer

The ABI states that sp[0] should point to the previous stack frame, or be
zero if there is no previous stack frame.  makecontext previously set this
slot to point to the __start_context function, rather than to a valid
stack frame.
---
 arch/ppc/makecontext.c   | 2 +-
 arch/ppc64/makecontext.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/ppc/makecontext.c b/arch/ppc/makecontext.c
index 1b9efdf..729f465 100644
--- a/arch/ppc/makecontext.c
+++ b/arch/ppc/makecontext.c
@@ -44,7 +44,7 @@ __makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
 	ucp->uc_mcontext.gregs[REG_R31]  = (uintptr_t) ucp->uc_link;
 	ucp->uc_mcontext.gregs[REG_SP]   = (uintptr_t) sp;
 
-	sp[0] = (uintptr_t) &__start_context;
+	sp[0] = 0;
 	sp[uc_link] = (uintptr_t) ucp->uc_link;
 	argp = &sp[2];
 
diff --git a/arch/ppc64/makecontext.c b/arch/ppc64/makecontext.c
index 9d6b998..91fb579 100644
--- a/arch/ppc64/makecontext.c
+++ b/arch/ppc64/makecontext.c
@@ -45,7 +45,7 @@ __makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
 	ucp->uc_mcontext.gp_regs[REG_ENTRY] = (uintptr_t) func;
 	ucp->uc_mcontext.gp_regs[REG_R31]   = (uintptr_t) ucp->uc_link;
 
-	sp[0] = (uintptr_t) &__start_context;
+	sp[0] = 0;
 	sp[uc_link] = (uintptr_t) ucp->uc_link;
 	argp = &sp[2];
 
From b500b054c7cf412a6042496afa08b4302f7ed929 Mon Sep 17 00:00:00 2001
From: Bobby Bingham <koorogi@koorogi.info>
Date: Fri, 5 Apr 2019 13:38:36 -0500
Subject: [PATCH] ppc32/64: don't store uc_link on the stack

This was previously stored either in the CR (ppc64) or LR (ppc32) save
area of the stack, or to one of the parameter save slots.

In either case, the saved value was unused.  This value is also passed
to __start_context via r31, so there's no need to pass it on the stack.
---
 arch/ppc/makecontext.c   | 6 ++----
 arch/ppc64/makecontext.c | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/arch/ppc/makecontext.c b/arch/ppc/makecontext.c
index 729f465..2b7ea67 100644
--- a/arch/ppc/makecontext.c
+++ b/arch/ppc/makecontext.c
@@ -30,13 +30,12 @@ __makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
 	greg_t *sp, *argp;
 	va_list va;
 	int i;
-	unsigned int uc_link, stack_args;
+	unsigned int stack_args;
 
 	stack_args = argc > 8 ? argc - 8 : 0;
-	uc_link = stack_args + 1;
 
 	sp = (greg_t *) ((uintptr_t) ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size);
-	sp -= (uc_link + 1);
+	sp -= stack_args + 2;
 	sp = (greg_t *) ((uintptr_t) sp & -16L);
 
 	ucp->uc_mcontext.gregs[REG_NIP]  = (uintptr_t) func;
@@ -45,7 +44,6 @@ __makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
 	ucp->uc_mcontext.gregs[REG_SP]   = (uintptr_t) sp;
 
 	sp[0] = 0;
-	sp[uc_link] = (uintptr_t) ucp->uc_link;
 	argp = &sp[2];
 
 	va_start(va, argc);
diff --git a/arch/ppc64/makecontext.c b/arch/ppc64/makecontext.c
index 91fb579..b060371 100644
--- a/arch/ppc64/makecontext.c
+++ b/arch/ppc64/makecontext.c
@@ -30,13 +30,12 @@ __makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
 	greg_t *sp, *argp;
 	va_list va;
 	int i;
-	unsigned int uc_link, stack_args;
+	unsigned int stack_args;
 
 	stack_args = argc > 8 ? argc - 8 : 0;
-	uc_link = stack_args + 1;
 
 	sp = (greg_t *) ((uintptr_t) ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size);
-	sp -= (uc_link + 1);
+	sp -= stack_args + 2;
 	sp = (greg_t *) (((uintptr_t) sp & -16L));
 
 	ucp->uc_mcontext.gp_regs[REG_NIP]   = (uintptr_t) func;
@@ -46,7 +45,6 @@ __makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
 	ucp->uc_mcontext.gp_regs[REG_R31]   = (uintptr_t) ucp->uc_link;
 
 	sp[0] = 0;
-	sp[uc_link] = (uintptr_t) ucp->uc_link;
 	argp = &sp[2];
 
 	va_start(va, argc);
From 55168fcb1809dde45c99450f1f3be27716c473db Mon Sep 17 00:00:00 2001
From: Bobby Bingham <koorogi@koorogi.info>
Date: Fri, 5 Apr 2019 13:57:53 -0500
Subject: [PATCH] ppc32/64: simplify storage of stack parameters

The switch statement is simpler as an if/else, and removing the argp
variable makes the code more symmetric between the register and stack
parameter cases.
---
 arch/ppc/makecontext.c   | 24 ++++++------------------
 arch/ppc64/makecontext.c | 24 ++++++------------------
 2 files changed, 12 insertions(+), 36 deletions(-)

diff --git a/arch/ppc/makecontext.c b/arch/ppc/makecontext.c
index 2b7ea67..4a404a4 100644
--- a/arch/ppc/makecontext.c
+++ b/arch/ppc/makecontext.c
@@ -27,7 +27,7 @@ extern void __start_context(void);
 void
 __makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
 {
-	greg_t *sp, *argp;
+	greg_t *sp;
 	va_list va;
 	int i;
 	unsigned int stack_args;
@@ -44,27 +44,15 @@ __makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
 	ucp->uc_mcontext.gregs[REG_SP]   = (uintptr_t) sp;
 
 	sp[0] = 0;
-	argp = &sp[2];
 
 	va_start(va, argc);
 
-	for (i = 0; i < argc; i++)
-		switch (i)
-		{
-		case 0:
-		case 1:
-		case 2:
-		case 3:
-		case 4:
-		case 5:
-		case 6:
-		case 7:
+	for (i = 0; i < argc; i++) {
+		if (i < 8)
 			ucp->uc_mcontext.gregs[i + 3] = va_arg (va, greg_t);
-			break;
-		default:
-			*argp++ = va_arg (va, greg_t);
-			break;
-		}
+		else
+			sp[i-8 + 2] = va_arg (va, greg_t);
+	}
 
 	va_end(va);
 }
diff --git a/arch/ppc64/makecontext.c b/arch/ppc64/makecontext.c
index b060371..962f98a 100644
--- a/arch/ppc64/makecontext.c
+++ b/arch/ppc64/makecontext.c
@@ -27,7 +27,7 @@ extern void __start_context(void);
 void
 __makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
 {
-	greg_t *sp, *argp;
+	greg_t *sp;
 	va_list va;
 	int i;
 	unsigned int stack_args;
@@ -45,27 +45,15 @@ __makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
 	ucp->uc_mcontext.gp_regs[REG_R31]   = (uintptr_t) ucp->uc_link;
 
 	sp[0] = 0;
-	argp = &sp[2];
 
 	va_start(va, argc);
 
-	for (i = 0; i < argc; i++)
-		switch (i)
-		{
-		case 0:
-		case 1:
-		case 2:
-		case 3:
-		case 4:
-		case 5:
-		case 6:
-		case 7:
+	for (i = 0; i < argc; i++) {
+		if (i < 8)
 			ucp->uc_mcontext.gp_regs[i + 3] = va_arg (va, greg_t);
-			break;
-		default:
-			*argp++ = va_arg (va, greg_t);
-			break;
-		}
+		else
+			sp[i-8 + 2] = va_arg (va, greg_t);
+	}
 
 	va_end(va);
 }
From 8ea5f548b9146ffeea2074a33a06bbbd07a74402 Mon Sep 17 00:00:00 2001
From: Bobby Bingham <koorogi@koorogi.info>
Date: Fri, 5 Apr 2019 14:01:10 -0500
Subject: [PATCH] ppc64: fix makecontext with more than 8 parameters

The ELFv2 ABI used on PPC64 differs from the ELFv1 ABI used on PPC32 here.
On PPC64, once there are any parameters that need to be passed on the
stack, space needs to be reserved on the stack to pass all parameters.
Parameters 0-7 are still only passed by register, but if the callee needs
to spill them, it can use the stack space reserved for the corresponding
parameter to do so.
---
 arch/ppc64/makecontext.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/ppc64/makecontext.c b/arch/ppc64/makecontext.c
index 962f98a..ea980e9 100644
--- a/arch/ppc64/makecontext.c
+++ b/arch/ppc64/makecontext.c
@@ -32,7 +32,7 @@ __makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
 	int i;
 	unsigned int stack_args;
 
-	stack_args = argc > 8 ? argc - 8 : 0;
+	stack_args = argc > 8 ? argc : 0;
 
 	sp = (greg_t *) ((uintptr_t) ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size);
 	sp -= stack_args + 2;
@@ -52,7 +52,7 @@ __makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
 		if (i < 8)
 			ucp->uc_mcontext.gp_regs[i + 3] = va_arg (va, greg_t);
 		else
-			sp[i-8 + 2] = va_arg (va, greg_t);
+			sp[i + 2] = va_arg (va, greg_t);
 	}
 
 	va_end(va);
From a00a05ce2950ca3b306f8ccc3e817ea8cd675015 Mon Sep 17 00:00:00 2001
From: Bobby Bingham <koorogi@koorogi.info>
Date: Fri, 5 Apr 2019 14:03:47 -0500
Subject: [PATCH] ppc64: fix incorrect position of parameters within stack
 frame

On PPC64, there are 4 register-sized stack slots below the parameter save
area, which is different from the 2 stack slots on PPC32.
---
 arch/ppc64/makecontext.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/ppc64/makecontext.c b/arch/ppc64/makecontext.c
index ea980e9..a4c1bf9 100644
--- a/arch/ppc64/makecontext.c
+++ b/arch/ppc64/makecontext.c
@@ -35,7 +35,7 @@ __makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
 	stack_args = argc > 8 ? argc : 0;
 
 	sp = (greg_t *) ((uintptr_t) ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size);
-	sp -= stack_args + 2;
+	sp -= stack_args + 4;
 	sp = (greg_t *) (((uintptr_t) sp & -16L));
 
 	ucp->uc_mcontext.gp_regs[REG_NIP]   = (uintptr_t) func;
@@ -52,7 +52,7 @@ __makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
 		if (i < 8)
 			ucp->uc_mcontext.gp_regs[i + 3] = va_arg (va, greg_t);
 		else
-			sp[i + 2] = va_arg (va, greg_t);
+			sp[i + 4] = va_arg (va, greg_t);
 	}
 
 	va_end(va);
From 40d07758a5677e8869d7a62a499236bb6ed01897 Mon Sep 17 00:00:00 2001
From: Bobby Bingham <koorogi@koorogi.info>
Date: Fri, 5 Apr 2019 14:09:25 -0500
Subject: [PATCH] ppc32/64: correct signature of function parameter to
 makecontext

Because makecontext can pass a set of integer arguments to the provided
function, it is incorrect to require that this function accept no
parameters.
---
 arch/ppc/makecontext.c   | 2 +-
 arch/ppc64/makecontext.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/ppc/makecontext.c b/arch/ppc/makecontext.c
index 4a404a4..0633c0f 100644
--- a/arch/ppc/makecontext.c
+++ b/arch/ppc/makecontext.c
@@ -25,7 +25,7 @@ extern void __start_context(void);
 
 
 void
-__makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
+__makecontext(ucontext_t *ucp, void (*func)(), int argc, ...)
 {
 	greg_t *sp;
 	va_list va;
diff --git a/arch/ppc64/makecontext.c b/arch/ppc64/makecontext.c
index a4c1bf9..8a293b5 100644
--- a/arch/ppc64/makecontext.c
+++ b/arch/ppc64/makecontext.c
@@ -25,7 +25,7 @@ extern void __start_context(void);
 
 
 void
-__makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
+__makecontext(ucontext_t *ucp, void (*func)(), int argc, ...)
 {
 	greg_t *sp;
 	va_list va;
From edf69879eadaec0c72ba7ef5e7d2389946c6644b Mon Sep 17 00:00:00 2001
From: Bobby Bingham <koorogi@koorogi.info>
Date: Fri, 5 Apr 2019 14:09:39 -0500
Subject: [PATCH] ppc64: remove unnecessary parentheses

---
 arch/ppc64/makecontext.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/ppc64/makecontext.c b/arch/ppc64/makecontext.c
index 8a293b5..84d390a 100644
--- a/arch/ppc64/makecontext.c
+++ b/arch/ppc64/makecontext.c
@@ -36,7 +36,7 @@ __makecontext(ucontext_t *ucp, void (*func)(), int argc, ...)
 
 	sp = (greg_t *) ((uintptr_t) ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size);
 	sp -= stack_args + 4;
-	sp = (greg_t *) (((uintptr_t) sp & -16L));
+	sp = (greg_t *) ((uintptr_t) sp & -16L);
 
 	ucp->uc_mcontext.gp_regs[REG_NIP]   = (uintptr_t) func;
 	ucp->uc_mcontext.gp_regs[REG_LNK]   = (uintptr_t) &__start_context;
From 29eac4259adfd85e0f4946a1080bb9e3f8c0cc2e Mon Sep 17 00:00:00 2001
From: Bobby Bingham <koorogi@koorogi.info>
Date: Fri, 5 Apr 2019 14:10:28 -0500
Subject: [PATCH] ppc32/64: remove unused includes

---
 arch/ppc/makecontext.c   | 2 --
 arch/ppc64/makecontext.c | 2 --
 2 files changed, 4 deletions(-)

diff --git a/arch/ppc/makecontext.c b/arch/ppc/makecontext.c
index 0633c0f..7214a40 100644
--- a/arch/ppc/makecontext.c
+++ b/arch/ppc/makecontext.c
@@ -11,10 +11,8 @@
  */
 
 #define _GNU_SOURCE
-#include <stddef.h>
 #include <stdarg.h>
 #include <signal.h>
-#include <string.h>
 #include <stdint.h>
 
 
diff --git a/arch/ppc64/makecontext.c b/arch/ppc64/makecontext.c
index 84d390a..2650f56 100644
--- a/arch/ppc64/makecontext.c
+++ b/arch/ppc64/makecontext.c
@@ -11,10 +11,8 @@
  */
 
 #define _GNU_SOURCE
-#include <stddef.h>
 #include <stdarg.h>
 #include <signal.h>
-#include <string.h>
 #include <stdint.h>
 
 
From 90ff6330e62c8f836016668c9f769af365b257cb Mon Sep 17 00:00:00 2001
From: Bobby Bingham <koorogi@koorogi.info>
Date: Fri, 5 Apr 2019 14:11:21 -0500
Subject: [PATCH] ppc32/64: update copyright

---
 arch/ppc/makecontext.c   | 1 +
 arch/ppc64/makecontext.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/arch/ppc/makecontext.c b/arch/ppc/makecontext.c
index 7214a40..51c492f 100644
--- a/arch/ppc/makecontext.c
+++ b/arch/ppc/makecontext.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2018 William Pitcock <nenolod@dereferenced.org>
+ * Copyright (c) 2019 Bobby Bingham <koorogi@koorogi.info>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/arch/ppc64/makecontext.c b/arch/ppc64/makecontext.c
index 2650f56..43da557 100644
--- a/arch/ppc64/makecontext.c
+++ b/arch/ppc64/makecontext.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2018 William Pitcock <nenolod@dereferenced.org>
+ * Copyright (c) 2019 Bobby Bingham <koorogi@koorogi.info>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
From 2610c7faa7b9c4114d53bb659264a6be238cd2a3 Mon Sep 17 00:00:00 2001
From: Bobby Bingham <koorogi@koorogi.info>
Date: Sat, 23 Feb 2019 17:12:37 -0600
Subject: [PATCH] ppc32/64: rewrite get/set/swapcontext in assembly

getcontext cannot be correctly implemented in C.

If this calls another function, as it does to call syscall, it needs to
first spill its return address to the stack.  If, after getcontext returns,
its caller then calls other functions, this saved return address can be
clobbered.  When the context saved by getcontext is later restored, the
(now clobbered) return address will be reloaded from the stack, and the
second return from getcontext will return to the wrong location.

Because the powerpc swapcontext syscall allows either the old context or
new context pointers to be null, it is usable for implementing all of
get/set/swapcontext.

We therefore rewrite swapcontext in assembly, and get/setcontext as simple
assembly function wrappers around swapcontext.

The one piece we keep in C is the code to check the return value of the
system call and to set errno.  This code was actually unnecessary before --
libc does this within syscall.  However, now that the system call is made
directly in assembly, bypassing libc, it is truly necessary.  Because errno
is thread-local and the details of how to set it can vary by libc, this
code remains written in C.
---
 Makefile                                      | 10 +----
 README.md                                     |  2 +-
 arch/ppc/getcontext.S                         | 20 +++++++++
 arch/ppc/{getcontext.c => retfromsyscall.c}   | 30 +++----------
 arch/ppc/setcontext.S                         | 21 +++++++++
 arch/ppc/setcontext.c                         | 45 -------------------
 arch/ppc/swapcontext.S                        | 23 ++++++++++
 arch/ppc/swapcontext.c                        | 45 -------------------
 arch/ppc64/getcontext.S                       | 25 +++++++++++
 arch/ppc64/{getcontext.c => retfromsyscall.c} | 30 +++----------
 arch/ppc64/setcontext.S                       | 26 +++++++++++
 arch/ppc64/setcontext.c                       | 45 -------------------
 arch/ppc64/swapcontext.S                      | 28 ++++++++++++
 arch/ppc64/swapcontext.c                      | 45 -------------------
 14 files changed, 156 insertions(+), 239 deletions(-)
 create mode 100644 arch/ppc/getcontext.S
 rename arch/ppc/{getcontext.c => retfromsyscall.c} (53%)
 create mode 100644 arch/ppc/setcontext.S
 delete mode 100644 arch/ppc/setcontext.c
 create mode 100644 arch/ppc/swapcontext.S
 delete mode 100644 arch/ppc/swapcontext.c
 create mode 100644 arch/ppc64/getcontext.S
 rename arch/ppc64/{getcontext.c => retfromsyscall.c} (53%)
 create mode 100644 arch/ppc64/setcontext.S
 delete mode 100644 arch/ppc64/setcontext.c
 create mode 100644 arch/ppc64/swapcontext.S
 delete mode 100644 arch/ppc64/swapcontext.c

diff --git a/Makefile b/Makefile
index 51365a3..d6ff1b0 100644
--- a/Makefile
+++ b/Makefile
@@ -2,14 +2,8 @@ ARCH := $(shell uname -m)
 
 CFLAGS = -ggdb3 -O2 -Wall -Iarch/${ARCH}
 
-LIBUCONTEXT_C_SRC = \
-	arch/${ARCH}/makecontext.c
-
-LIBUCONTEXT_S_SRC = \
-	arch/${ARCH}/getcontext.S \
-	arch/${ARCH}/setcontext.S \
-	arch/${ARCH}/swapcontext.S \
-	arch/${ARCH}/startcontext.S
+LIBUCONTEXT_C_SRC = $(wildcard arch/${ARCH}/*.c)
+LIBUCONTEXT_S_SRC = $(wildcard arch/${ARCH}/*.S)
 
 LIBUCONTEXT_OBJ = ${LIBUCONTEXT_C_SRC:.c=.o} ${LIBUCONTEXT_S_SRC:.S=.o}
 LIBUCONTEXT_SOVERSION = 0
diff --git a/README.md b/README.md
index 6bd4493..27d3d0b 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ Right now these archs are supported and should work on bare metal:
  * aarch64
  * s390x
 
-These archs require kernel assistance and use a syscall (the only assembly is the trampoline):
+These archs require kernel assistance and use a syscall:
 
  * ppc
  * ppc64 (ELFv2 ABI spec only, ELFv1 not supported)
diff --git a/arch/ppc/getcontext.S b/arch/ppc/getcontext.S
new file mode 100644
index 0000000..beffaf5
--- /dev/null
+++ b/arch/ppc/getcontext.S
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2019 Bobby Bingham <koorogi@koorogi.info>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * This software is provided 'as is' and without any warranty, express or
+ * implied.  In no event shall the authors be liable for any damages arising
+ * from the use of this software.
+ */
+
+.global __getcontext
+.hidden __swapcontext
+__getcontext:
+	li 4, 0
+	b __swapcontext@local
+
+.weak getcontext
+getcontext = __getcontext
diff --git a/arch/ppc/getcontext.c b/arch/ppc/retfromsyscall.c
similarity index 53%
rename from arch/ppc/getcontext.c
rename to arch/ppc/retfromsyscall.c
index 5da9dfb..3ad43c0 100644
--- a/arch/ppc/getcontext.c
+++ b/arch/ppc/retfromsyscall.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2018 William Pitcock <nenolod@dereferenced.org>
+ * Copyright (c) 2019 Bobby Bingham <koorogi@koorogi.info>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -10,36 +11,15 @@
  * from the use of this software.
  */
 
-#define _GNU_SOURCE
-#include <stddef.h>
-#include <stdarg.h>
-#include <signal.h>
-#include <string.h>
-#include <stdint.h>
 #include <errno.h>
-#include <unistd.h>
-#include <sys/syscall.h>
 
-
-int
-__getcontext(ucontext_t *ucp)
+__attribute__ ((visibility ("hidden")))
+int __retfromsyscall(long retval)
 {
-#ifdef SYS_swapcontext
-	int r;
-
-	r = syscall(SYS_swapcontext, ucp, NULL, sizeof(ucontext_t));
-	if (r < 0)
-	{
-		errno = -r;
+	if (retval < 0) {
+		errno = -retval;
 		return -1;
 	}
-
 	return 0;
-#else
-	errno = ENOSYS;
-	return -1;
-#endif
 }
 
-
-extern __typeof(__getcontext) getcontext __attribute__((weak, __alias__("__getcontext")));
diff --git a/arch/ppc/setcontext.S b/arch/ppc/setcontext.S
new file mode 100644
index 0000000..89e6de0
--- /dev/null
+++ b/arch/ppc/setcontext.S
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2019 Bobby Bingham <koorogi@koorogi.info>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * This software is provided 'as is' and without any warranty, express or
+ * implied.  In no event shall the authors be liable for any damages arising
+ * from the use of this software.
+ */
+
+.global __setcontext
+.hidden __swapcontext
+__setcontext:
+	mr 4, 3
+	li 3, 0
+	b __swapcontext@local
+
+.weak setcontext
+setcontext = __setcontext
diff --git a/arch/ppc/setcontext.c b/arch/ppc/setcontext.c
deleted file mode 100644
index 59c65b4..0000000
--- a/arch/ppc/setcontext.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2018 William Pitcock <nenolod@dereferenced.org>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * This software is provided 'as is' and without any warranty, express or
- * implied.  In no event shall the authors be liable for any damages arising
- * from the use of this software.
- */
-
-#define _GNU_SOURCE
-#include <stddef.h>
-#include <stdarg.h>
-#include <signal.h>
-#include <string.h>
-#include <stdint.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/syscall.h>
-
-
-int
-__setcontext(const ucontext_t *ucp)
-{
-#ifdef SYS_swapcontext
-	int r;
-
-	r = syscall(SYS_swapcontext, NULL, (void *) ucp, sizeof(ucontext_t));
-	if (r < 0)
-	{
-		errno = -r;
-		return -1;
-	}
-
-	return r;
-#else
-	errno = ENOSYS;
-	return -1;
-#endif
-}
-
-
-extern __typeof(__setcontext) setcontext __attribute__((weak, __alias__("__setcontext")));
diff --git a/arch/ppc/swapcontext.S b/arch/ppc/swapcontext.S
new file mode 100644
index 0000000..24b6655
--- /dev/null
+++ b/arch/ppc/swapcontext.S
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2019 Bobby Bingham <koorogi@koorogi.info>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * This software is provided 'as is' and without any warranty, express or
+ * implied.  In no event shall the authors be liable for any damages arising
+ * from the use of this software.
+ */
+
+.global __swapcontext
+__swapcontext:
+	li 0, 249     # SYS_swapcontext
+	li 5, 1184    # sizeof(ucontext_t)
+	sc
+
+.hidden __retfromsyscall
+	b __retfromsyscall@local
+
+.weak swapcontext
+swapcontext = __swapcontext
diff --git a/arch/ppc/swapcontext.c b/arch/ppc/swapcontext.c
deleted file mode 100644
index af14bc2..0000000
--- a/arch/ppc/swapcontext.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2018 William Pitcock <nenolod@dereferenced.org>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * This software is provided 'as is' and without any warranty, express or
- * implied.  In no event shall the authors be liable for any damages arising
- * from the use of this software.
- */
-
-#define _GNU_SOURCE
-#include <stddef.h>
-#include <stdarg.h>
-#include <signal.h>
-#include <string.h>
-#include <stdint.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/syscall.h>
-
-
-int
-__swapcontext(ucontext_t *oucp, const ucontext_t *ucp)
-{
-#ifdef SYS_swapcontext
-	int r;
-
-	r = syscall(SYS_swapcontext, oucp, ucp, sizeof(ucontext_t));
-	if (r < 0)
-	{
-		errno = -r;
-		return -1;
-	}
-
-	return r;
-#else
-	errno = ENOSYS;
-	return -1;
-#endif
-}
-
-
-extern __typeof(__swapcontext) swapcontext __attribute__((weak, __alias__("__swapcontext")));
diff --git a/arch/ppc64/getcontext.S b/arch/ppc64/getcontext.S
new file mode 100644
index 0000000..935edd2
--- /dev/null
+++ b/arch/ppc64/getcontext.S
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2019 Bobby Bingham <koorogi@koorogi.info>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * This software is provided 'as is' and without any warranty, express or
+ * implied.  In no event shall the authors be liable for any damages arising
+ * from the use of this software.
+ */
+
+.global __getcontext
+.hidden __swapcontext
+__getcontext:
+	addis 2, 12, .TOC.-__getcontext@ha
+	addi  2, 12, .TOC.-__getcontext@l
+
+	.localentry __getcontext,.-__getcontext
+
+	li 4, 0
+	b __swapcontext
+
+.weak getcontext
+getcontext = __getcontext
diff --git a/arch/ppc64/getcontext.c b/arch/ppc64/retfromsyscall.c
similarity index 53%
rename from arch/ppc64/getcontext.c
rename to arch/ppc64/retfromsyscall.c
index 5da9dfb..3ad43c0 100644
--- a/arch/ppc64/getcontext.c
+++ b/arch/ppc64/retfromsyscall.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2018 William Pitcock <nenolod@dereferenced.org>
+ * Copyright (c) 2019 Bobby Bingham <koorogi@koorogi.info>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -10,36 +11,15 @@
  * from the use of this software.
  */
 
-#define _GNU_SOURCE
-#include <stddef.h>
-#include <stdarg.h>
-#include <signal.h>
-#include <string.h>
-#include <stdint.h>
 #include <errno.h>
-#include <unistd.h>
-#include <sys/syscall.h>
 
-
-int
-__getcontext(ucontext_t *ucp)
+__attribute__ ((visibility ("hidden")))
+int __retfromsyscall(long retval)
 {
-#ifdef SYS_swapcontext
-	int r;
-
-	r = syscall(SYS_swapcontext, ucp, NULL, sizeof(ucontext_t));
-	if (r < 0)
-	{
-		errno = -r;
+	if (retval < 0) {
+		errno = -retval;
 		return -1;
 	}
-
 	return 0;
-#else
-	errno = ENOSYS;
-	return -1;
-#endif
 }
 
-
-extern __typeof(__getcontext) getcontext __attribute__((weak, __alias__("__getcontext")));
diff --git a/arch/ppc64/setcontext.S b/arch/ppc64/setcontext.S
new file mode 100644
index 0000000..5a0cde3
--- /dev/null
+++ b/arch/ppc64/setcontext.S
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2019 Bobby Bingham <koorogi@koorogi.info>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * This software is provided 'as is' and without any warranty, express or
+ * implied.  In no event shall the authors be liable for any damages arising
+ * from the use of this software.
+ */
+
+.global __setcontext
+.hidden __swapcontext
+__setcontext:
+	addis 2, 12, .TOC.-__setcontext@ha
+	addi  2, 12, .TOC.-__setcontext@l
+
+	.localentry __setcontext,.-__setcontext
+
+	mr 4, 3
+	li 3, 0
+	b __swapcontext
+
+.weak setcontext
+setcontext = __setcontext
diff --git a/arch/ppc64/setcontext.c b/arch/ppc64/setcontext.c
deleted file mode 100644
index 59c65b4..0000000
--- a/arch/ppc64/setcontext.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2018 William Pitcock <nenolod@dereferenced.org>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * This software is provided 'as is' and without any warranty, express or
- * implied.  In no event shall the authors be liable for any damages arising
- * from the use of this software.
- */
-
-#define _GNU_SOURCE
-#include <stddef.h>
-#include <stdarg.h>
-#include <signal.h>
-#include <string.h>
-#include <stdint.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/syscall.h>
-
-
-int
-__setcontext(const ucontext_t *ucp)
-{
-#ifdef SYS_swapcontext
-	int r;
-
-	r = syscall(SYS_swapcontext, NULL, (void *) ucp, sizeof(ucontext_t));
-	if (r < 0)
-	{
-		errno = -r;
-		return -1;
-	}
-
-	return r;
-#else
-	errno = ENOSYS;
-	return -1;
-#endif
-}
-
-
-extern __typeof(__setcontext) setcontext __attribute__((weak, __alias__("__setcontext")));
diff --git a/arch/ppc64/swapcontext.S b/arch/ppc64/swapcontext.S
new file mode 100644
index 0000000..982537a
--- /dev/null
+++ b/arch/ppc64/swapcontext.S
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2019 Bobby Bingham <koorogi@koorogi.info>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * This software is provided 'as is' and without any warranty, express or
+ * implied.  In no event shall the authors be liable for any damages arising
+ * from the use of this software.
+ */
+
+.global __swapcontext
+__swapcontext:
+	addis 2, 12, .TOC.-__swapcontext@ha
+	addi  2, 12, .TOC.-__swapcontext@l
+
+	.localentry __swapcontext,.-__swapcontext
+
+	li 0, 249     # SYS_swapcontext
+	li 5, 1696    # sizeof(ucontext_t)
+	sc
+
+.hidden __retfromsyscall
+	b __retfromsyscall
+
+.weak swapcontext
+swapcontext = __swapcontext
diff --git a/arch/ppc64/swapcontext.c b/arch/ppc64/swapcontext.c
deleted file mode 100644
index af14bc2..0000000
--- a/arch/ppc64/swapcontext.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2018 William Pitcock <nenolod@dereferenced.org>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * This software is provided 'as is' and without any warranty, express or
- * implied.  In no event shall the authors be liable for any damages arising
- * from the use of this software.
- */
-
-#define _GNU_SOURCE
-#include <stddef.h>
-#include <stdarg.h>
-#include <signal.h>
-#include <string.h>
-#include <stdint.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/syscall.h>
-
-
-int
-__swapcontext(ucontext_t *oucp, const ucontext_t *ucp)
-{
-#ifdef SYS_swapcontext
-	int r;
-
-	r = syscall(SYS_swapcontext, oucp, ucp, sizeof(ucontext_t));
-	if (r < 0)
-	{
-		errno = -r;
-		return -1;
-	}
-
-	return r;
-#else
-	errno = ENOSYS;
-	return -1;
-#endif
-}
-
-
-extern __typeof(__swapcontext) swapcontext __attribute__((weak, __alias__("__swapcontext")));