/
gdb-8.1.patch
3145 lines (3125 loc) · 88.7 KB
/
gdb-8.1.patch
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
From a3b840020a783940bf20c4e82e0297bc7e5737c1 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Sun, 2 Sep 2018 14:12:11 -0400
Subject: [PATCH] Add Haiku-specific code and build system logic.
Originally based on the 6.3 port, with heavy modifications for the new
GCC APIs (surprisingly not a massive amount has changed in 14 years,
though still a significant amount.)
---
bfd/config.bfd | 9 +
gdb/Makefile.in | 13 +
gdb/amd64-haiku-nat.c | 96 +++
gdb/amd64-haiku-tdep.c | 62 ++
gdb/config/i386/nm-haiku.h | 27 +
gdb/config/nm-haiku.h | 25 +
gdb/config/tm-haiku.h | 25 +
gdb/configure.host | 2 +
gdb/configure.nat | 21 +
gdb/configure.tgt | 17 +-
gdb/defs.h | 23 +-
gdb/haiku-nat.c | 1704 ++++++++++++++++++++++++++++++++++++++++++++
gdb/haiku-nat.h | 53 ++
gdb/haiku-tdep.c | 22 +
gdb/i386-haiku-nat.c | 87 +++
gdb/i386-haiku-tdep.c | 77 ++
gdb/osabi.c | 9 +-
gdb/solib-haiku.c | 446 ++++++++++++
gdb/solib-haiku.h | 34 +
readline/histfile.c | 2 +-
readline/input.c | 2 +-
21 files changed, 2736 insertions(+), 20 deletions(-)
create mode 100644 gdb/amd64-haiku-nat.c
create mode 100644 gdb/amd64-haiku-tdep.c
create mode 100644 gdb/config/i386/nm-haiku.h
create mode 100644 gdb/config/nm-haiku.h
create mode 100644 gdb/config/tm-haiku.h
create mode 100644 gdb/haiku-nat.c
create mode 100644 gdb/haiku-nat.h
create mode 100644 gdb/haiku-tdep.c
create mode 100644 gdb/i386-haiku-nat.c
create mode 100644 gdb/i386-haiku-tdep.c
create mode 100644 gdb/solib-haiku.c
create mode 100644 gdb/solib-haiku.h
diff --git a/bfd/config.bfd b/bfd/config.bfd
index f04a993..c23406b 100644
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -732,6 +732,10 @@ case "${targ}" in
targ_defvec=i386_elf32_vec
targ_selvecs="iamcu_elf32_vec i386_aout_nbsd_vec"
;;
+ i[3-7]86-*-haiku*)
+ targ_defvec=i386_elf32_vec
+ targ_selvecs="i386_pe_vec i386_pei_vec"
+ ;;
i[3-7]86-*-netware*)
targ_defvec=i386_elf32_vec
targ_selvecs="iamcu_elf32_vec i386_nlm32_vec i386_coff_vec i386_aout_vec"
@@ -793,6 +797,11 @@ case "${targ}" in
targ_selvecs="i386_elf32_vec iamcu_elf32_vec i386_aout_nbsd_vec i386_coff_vec i386_pei_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec"
want64=true
;;
+ x86_64-*-haiku*)
+ targ_defvec=x86_64_elf64_vec
+ targ_selvecs="i386_elf32_vec i386_coff_vec i386_pei_vec x86_64_pei_vec"
+ want64=true
+ ;;
x86_64-*-linux-*)
targ_defvec=x86_64_elf64_vec
targ_selvecs="i386_elf32_vec iamcu_elf32_vec x86_64_elf32_vec i386_aout_linux_vec i386_pei_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec"
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 17b71c6..37e2f31 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -645,6 +645,7 @@ ALL_64_TARGET_OBS = \
amd64-linux-tdep.o \
amd64-nbsd-tdep.o \
amd64-obsd-tdep.o \
+ amd64-haiku-tdep.o \
amd64-sol2-tdep.o \
amd64-tdep.o \
amd64-windows-tdep.o \
@@ -706,6 +707,7 @@ ALL_TARGET_OBS = \
i386-nbsd-tdep.o \
i386-nto-tdep.o \
i386-obsd-tdep.o \
+ i386-haiku-tdep.o \
i386-sol2-tdep.o \
i386-tdep.o \
i387-tdep.o \
@@ -740,6 +742,7 @@ ALL_TARGET_OBS = \
nios2-tdep.o \
nto-tdep.o \
obsd-tdep.o \
+ haiku-tdep.o \
ppc-fbsd-tdep.o \
ppc-linux-tdep.o \
ppc-nbsd-tdep.o \
@@ -766,6 +769,7 @@ ALL_TARGET_OBS = \
solib-frv.o \
solib-spu.o \
solib-svr4.o \
+ solib-haiku.o \
sparc-linux-tdep.o \
sparc-nbsd-tdep.o \
sparc-obsd-tdep.o \
@@ -1298,6 +1302,7 @@ HFILES_NO_SRCDIR = \
objfiles.h \
obsd-nat.h \
obsd-tdep.h \
+ haiku-nat.h \
osabi.h \
osdata.h \
p-lang.h \
@@ -1347,6 +1352,7 @@ HFILES_NO_SRCDIR = \
solib-darwin.h \
solib-spu.h \
solib-svr4.h \
+ solib-haiku.h \
solib-target.h \
solist.h \
source.h \
@@ -2204,6 +2210,8 @@ ALLDEPFILES = \
amd64-nbsd-tdep.c \
amd64-obsd-nat.c \
amd64-obsd-tdep.c \
+ amd64-haiku-nat.c \
+ amd64-haiku-tdep.c \
amd64-sol2-tdep.c \
amd64-tdep.c \
arc-tdep.c \
@@ -2259,6 +2267,8 @@ ALLDEPFILES = \
i386-nbsd-tdep.c \
i386-obsd-nat.c \
i386-obsd-tdep.c \
+ i386-haiku-nat.c \
+ i386-haiku-tdep.c \
i386-sol2-nat.c \
i386-sol2-tdep.c \
i386-tdep.c \
@@ -2306,6 +2316,8 @@ ALLDEPFILES = \
nios2-tdep.c \
obsd-nat.c \
obsd-tdep.c \
+ haiku-nat.c \
+ haiku-tdep.c \
posix-hdep.c \
ppc-fbsd-nat.c \
ppc-fbsd-tdep.c \
@@ -2341,6 +2353,7 @@ ALLDEPFILES = \
solib-aix.c \
solib-spu.c \
solib-svr4.c \
+ solib-haiku.c \
sparc-linux-nat.c \
sparc-linux-tdep.c \
sparc-nat.c \
diff --git a/gdb/amd64-haiku-nat.c b/gdb/amd64-haiku-nat.c
new file mode 100644
index 0000000..bbce696
--- /dev/null
+++ b/gdb/amd64-haiku-nat.c
@@ -0,0 +1,96 @@
+/* Native-dependent code for Haiku x86_64.
+
+ Copyright 2012 Alex Smith <alex@alex-smith.me.uk>.
+ Copyright 2005 Ingo Weinhold <bonefish@cs.tu-berlin.de>.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#include "defs.h"
+#include "haiku-nat.h"
+#include "amd64-tdep.h"
+#include "i387-tdep.h"
+#include "inferior.h"
+#include "regcache.h"
+#include "target.h"
+
+/* Offset in `struct debug_cpu_state' where MEMBER is stored. */
+#define REG_OFFSET(member) offsetof (struct x86_64_debug_cpu_state, member)
+
+/* At kHaikuAMD64RegOffset[REGNUM] you'll find the offset in `struct
+ debug_cpu_state' where the GDB register REGNUM is stored. */
+static int kHaikuAMD64RegOffset[] = {
+ REG_OFFSET (rax),
+ REG_OFFSET (rbx),
+ REG_OFFSET (rcx),
+ REG_OFFSET (rdx),
+ REG_OFFSET (rsi),
+ REG_OFFSET (rdi),
+ REG_OFFSET (rbp),
+ REG_OFFSET (rsp),
+ REG_OFFSET (r8),
+ REG_OFFSET (r9),
+ REG_OFFSET (r10),
+ REG_OFFSET (r11),
+ REG_OFFSET (r12),
+ REG_OFFSET (r13),
+ REG_OFFSET (r14),
+ REG_OFFSET (r15),
+ REG_OFFSET (rip),
+ REG_OFFSET (rflags),
+ REG_OFFSET (cs),
+ REG_OFFSET (ss),
+ REG_OFFSET (ds),
+ REG_OFFSET (es),
+ REG_OFFSET (fs),
+ REG_OFFSET (gs)
+};
+
+
+void
+haiku_supply_registers(int reg, struct regcache *regcache, const debug_cpu_state *cpuState)
+{
+ if (reg == -1) {
+ int i;
+ for (i = 0; i < AMD64_NUM_REGS; i++)
+ haiku_supply_registers(i, regcache, cpuState);
+ } else if (reg < AMD64_ST0_REGNUM) {
+ int offset = kHaikuAMD64RegOffset[reg];
+ regcache_raw_supply (regcache, reg, (char*)cpuState + offset);
+ } else {
+ amd64_supply_fxsave (regcache, -1,
+ &cpuState->extended_registers);
+ }
+}
+
+
+void
+haiku_collect_registers(int reg, struct regcache *regcache, debug_cpu_state *cpuState)
+{
+ if (reg == -1) {
+ int i;
+ for (i = 0; i < AMD64_NUM_REGS; i++)
+ haiku_collect_registers(i, regcache, cpuState);
+ } else if (reg < AMD64_ST0_REGNUM) {
+ int offset = kHaikuAMD64RegOffset[reg];
+ regcache_raw_collect (regcache, reg, (char*)cpuState + offset);
+ } else {
+ amd64_collect_fxsave (regcache, -1,
+ &cpuState->extended_registers);
+ }
+}
+
diff --git a/gdb/amd64-haiku-tdep.c b/gdb/amd64-haiku-tdep.c
new file mode 100644
index 0000000..a34ce13
--- /dev/null
+++ b/gdb/amd64-haiku-tdep.c
@@ -0,0 +1,62 @@
+/* Target-dependent code for Haiku x86_64.
+
+ Copyright 2012 Alex Smith <alex@alex-smith.me.uk>.
+ Copyright 2005 Ingo Weinhold <bonefish@cs.tu-berlin.de>.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#include "defs.h"
+#include "gdbarch.h"
+#include "amd64-tdep.h"
+#include "x86-xstate.h"
+#include "osabi.h"
+
+
+static void
+amd64_haiku_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
+{
+ struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
+
+ amd64_init_abi (info, gdbarch, amd64_target_description (X86_XSTATE_SSE_MASK));
+
+ // the offset of the PC in the jmp_buf structure (cf. setjmp(), longjmp())
+ tdep->jb_pc_offset = 0;
+}
+
+
+static enum gdb_osabi
+amd64_haiku_osabi_sniffer (bfd * abfd)
+{
+ char *targetName = bfd_get_target (abfd);
+
+ if (strcmp (targetName, "elf64-x86-64") == 0)
+ return GDB_OSABI_HAIKU;
+
+ return GDB_OSABI_UNKNOWN;
+}
+
+
+void
+_initialize_amd64_haiku_tdep (void)
+{
+ gdbarch_register_osabi_sniffer (bfd_arch_i386, bfd_target_elf_flavour,
+ amd64_haiku_osabi_sniffer);
+
+ gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x86_64, GDB_OSABI_HAIKU,
+ amd64_haiku_init_abi);
+}
diff --git a/gdb/config/i386/nm-haiku.h b/gdb/config/i386/nm-haiku.h
new file mode 100644
index 0000000..b392360
--- /dev/null
+++ b/gdb/config/i386/nm-haiku.h
@@ -0,0 +1,27 @@
+/* Native support for Haiku x86.
+
+ Copyright 2005 Ingo Weinhold <bonefish@cs.tu-berlin.de>.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#ifndef NM_HAIKU_H
+#define NM_HAIKU_H
+
+#include "config/nm-haiku.h"
+
+#endif /* nm-haiku.h */
diff --git a/gdb/config/nm-haiku.h b/gdb/config/nm-haiku.h
new file mode 100644
index 0000000..e85a1c2
--- /dev/null
+++ b/gdb/config/nm-haiku.h
@@ -0,0 +1,25 @@
+/* Native support Haiku.
+
+ Copyright 2005 Ingo Weinhold <bonefish@cs.tu-berlin.de>.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+// #define REALTIME_{LO,HI}?
+
+/* Support for shared libraries. */
+#include "solib.h"
diff --git a/gdb/config/tm-haiku.h b/gdb/config/tm-haiku.h
new file mode 100644
index 0000000..cdead7b
--- /dev/null
+++ b/gdb/config/tm-haiku.h
@@ -0,0 +1,25 @@
+/* Target support Haiku.
+
+ Copyright 2005 Ingo Weinhold <bonefish@cs.tu-berlin.de>.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+// #define REALTIME_{LO,HI}?
+
+/* Support for shared libraries. */
+#include "solib.h"
diff --git a/gdb/configure.host b/gdb/configure.host
index 8e31834..901276d 100644
--- a/gdb/configure.host
+++ b/gdb/configure.host
@@ -115,6 +115,7 @@ i[34567]86-*-linux*) gdb_host=linux ;;
i[34567]86-*-gnu*) gdb_host=i386gnu ;;
i[3456]86-*-nto*) gdb_host=nto ;;
i[34567]86-*-openbsd*) gdb_host=obsd ;;
+i[34567]86-*-haiku*) gdb_host=haiku ;;
i[34567]86-*-solaris2* | x86_64-*-solaris2*)
gdb_host=sol2 ;;
i[34567]86-*-cygwin*) gdb_host=cygwin ;;
@@ -182,6 +183,7 @@ x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu)
x86_64-*-netbsd* | x86_64-*-knetbsd*-gnu)
gdb_host=nbsd64 ;;
x86_64-*-openbsd*) gdb_host=obsd64 ;;
+x86_64-*-haiku*) gdb_host=haiku64 ;;
x86_64-*-mingw*) gdb_host=mingw64
gdb_host_obs=mingw-hdep.o
;;
diff --git a/gdb/configure.nat b/gdb/configure.nat
index 8e14892..aebbc02 100644
--- a/gdb/configure.nat
+++ b/gdb/configure.nat
@@ -73,6 +73,9 @@ case ${gdb_host} in
obsd*)
NATDEPFILES='fork-child.o fork-inferior.o inf-ptrace.o'
;;
+ haiku*)
+ NATDEPFILES='fork-child.o fork-inferior.o haiku-nat.o'
+ ;;
cygwin*)
NATDEPFILES='x86-nat.o x86-dregs.o windows-nat.o'
;;
@@ -450,6 +453,24 @@ case ${gdb_host} in
;;
esac
;;
+ haiku)
+ case ${gdb_host_cpu} in
+ i386)
+ # Host: Haiku/i386 ELF
+ NATDEPFILES="${NATDEPFILES} i386-haiku-nat.o"
+ LOADLIBES='-ldebug -lnetwork'
+ ;;
+ esac
+ ;;
+ haiku64)
+ case ${gdb_host_cpu} in
+ i386)
+ # Host: Haiku/amd64
+ NATDEPFILES="${NATDEPFILES} amd64-haiku-nat.o"
+ LOADLIBES='-ldebug -lnetwork'
+ ;;
+ esac
+ ;;
ppc64-linux)
case ${gdb_host_cpu} in
powerpc)
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index fb8014a..c894bd4 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -97,6 +97,8 @@ case "${targ}" in
os_obs="nbsd-tdep.o solib-svr4.o";;
*-*-openbsd*)
os_obs="obsd-tdep.o solib-svr4.o";;
+*-*-haiku*)
+ os_obs="haiku-tdep.o solib-haiku.o symfile-mem.o";;
esac
# 3. Get the rest of objects.
@@ -259,6 +261,10 @@ i[34567]86-*-openbsd*)
# Target: OpenBSD/i386
gdb_target_obs="i386-bsd-tdep.o i386-obsd-tdep.o bsd-uthread.o"
;;
+i[34567]86-*-haiku*)
+ # Target: Haiku/i386
+ gdb_target_obs="i386-haiku-tdep.o"
+ ;;
i[34567]86-*-nto*)
# Target: Intel 386 running qnx6.
gdb_target_obs="solib-svr4.o \
@@ -318,8 +324,8 @@ iq2000-*-*)
gdb_sim=../sim/iq2000/libsim.a
;;
-lm32-*-*)
- gdb_target_obs="lm32-tdep.o"
+lm32-*-*)
+ gdb_target_obs="lm32-tdep.o"
gdb_sim=../sim/lm32/libsim.a
;;
@@ -651,7 +657,7 @@ tic6x-*-*linux)
;;
tic6x-*-*)
- # Target: TI C6X
+ # Target: TI C6X
gdb_target_obs="tic6x-tdep.o"
;;
@@ -736,6 +742,11 @@ x86_64-*-openbsd*)
i386-bsd-tdep.o i386-obsd-tdep.o \
bsd-uthread.o"
;;
+x86_64-*-haiku*)
+ # Target: Haiku/amd64
+ gdb_target_obs="amd64-haiku-tdep.o ${i386_tobjs} \
+ i386-haiku-tdep.o"
+ ;;
x86_64-*-rtems*)
gdb_target_obs="${amd64_tobjs} ${i386_tobjs} i386-bsd-tdep.o"
;;
diff --git a/gdb/defs.h b/gdb/defs.h
index 4fb2129..77dee99 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -99,7 +99,7 @@ using RequireLongest = gdb::Requires<gdb::Or<std::is_same<T, LONGEST>,
/* The O_BINARY flag is defined in fcntl.h on some non-Posix platforms.
It is used as an access modifier in calls to open(), where it acts
similarly to the "b" character in fopen()'s MODE argument. On Posix
- platforms it should be a no-op, so it is defined as 0 here. This
+ platforms it should be a no-op, so it is defined as 0 here. This
ensures that the symbol may be used freely elsewhere in gdb. */
#ifndef O_BINARY
@@ -284,11 +284,11 @@ struct value;
globals that are currently only available to main.c. */
extern char *relocate_gdb_directory (const char *initial, int flag);
-
+
/* Annotation stuff. */
extern int annotation_level; /* in stack.c */
-
+
/* From regex.c or libc. BSD 4.4 declares this with the argument type as
"const char *" in unistd.h, so we can't declare the argument
@@ -329,11 +329,11 @@ extern int print_address_symbolic (struct gdbarch *, CORE_ADDR,
extern int build_address_symbolic (struct gdbarch *,
CORE_ADDR addr,
- int do_demangle,
- char **name,
- int *offset,
- char **filename,
- int *line,
+ int do_demangle,
+ char **name,
+ int *offset,
+ char **filename,
+ int *line,
int *unmapped);
extern void print_address (struct gdbarch *, CORE_ADDR, struct ui_file *);
@@ -518,6 +518,7 @@ enum gdb_osabi
GDB_OSABI_FREEBSD,
GDB_OSABI_NETBSD,
GDB_OSABI_OPENBSD,
+ GDB_OSABI_HAIKU,
GDB_OSABI_WINCE,
GDB_OSABI_GO32,
GDB_OSABI_QNXNTO,
@@ -635,9 +636,9 @@ extern void (*deprecated_post_add_symbol_hook) (void);
extern void (*selected_frame_level_changed_hook) (int);
extern int (*deprecated_ui_loop_hook) (int signo);
extern void (*deprecated_show_load_progress) (const char *section,
- unsigned long section_sent,
- unsigned long section_size,
- unsigned long total_sent,
+ unsigned long section_sent,
+ unsigned long section_size,
+ unsigned long total_sent,
unsigned long total_size);
extern void (*deprecated_print_frame_info_listing_hook) (struct symtab * s,
int line,
diff --git a/gdb/haiku-nat.c b/gdb/haiku-nat.c
new file mode 100644
index 0000000..6d10161
--- /dev/null
+++ b/gdb/haiku-nat.c
@@ -0,0 +1,1704 @@
+/* Haiku native-dependent code common to multiple platforms.
+
+ Copyright 2005 Ingo Weinhold <bonefish@cs.tu-berlin.de>.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#define _GL_ALREADY_INCLUDING_STRING_H
+#include <stdio.h>
+#include <string.h>
+
+#include "defs.h" // include this first -- otherwise "command.h" will choke
+#include "command.h"
+#include "gdbcore.h"
+#include "gdbthread.h"
+#include "haiku-nat.h"
+#include "inferior.h"
+#include "observer.h"
+#include "regcache.h"
+#include "solib.h"
+#include "solib-haiku.h"
+#include "symfile.h"
+#include "target.h"
+#include "nat/fork-inferior.h"
+
+// Include these last, as haiku-nat.h takes care of including OS.h.
+#include <image.h>
+#include <private/debug/debug_support.h>
+
+#define TRACE_HAIKU_NAT
+#ifdef TRACE_HAIKU_NAT
+ #define TRACE(x) printf x
+#else
+ #define TRACE(x) while (false) {}
+#endif
+
+static struct target_ops *sHaikuTarget = NULL;
+
+typedef struct debug_event {
+ struct debug_event *next;
+ debug_debugger_message message;
+ debug_debugger_message_data data;
+} debug_event;
+
+typedef enum {
+ SIGNAL_ARRIVED, // the signal has actually arrived and is going to be
+ // handled (in any way)
+ SIGNAL_WILL_ARRIVE, // the signal has not yet been sent, but will be sent
+ // (e.g. an exception occurred and will cause the
+ // signal when not being ignored)
+ SIGNAL_FAKED, // the signal didn't arrive and won't arrive, we faked
+ // it (often in case of SIGTRAP)
+} pending_signal_status;
+
+typedef struct thread_debug_info {
+ thread_id thread;
+ bool stopped;
+ debug_event *last_event; // last debug message from
+ // the thread; valid only,
+ // if stopped
+ int reprocess_event; // > 0, the event
+ // shall be processed a
+ // that many times, which
+ // will probably trigger
+ // another target event
+ int signal; // only valid, if stopped
+ pending_signal_status signal_status;
+} thread_debug_info;
+
+typedef struct extended_image_info {
+ haiku_image_info info;
+ struct extended_image_info *next;
+} extended_image_info;
+
+typedef struct team_debug_info {
+ team_id team;
+ port_id debugger_port;
+ thread_id nub_thread;
+ debug_context context;
+ std::vector<thread_debug_info*> threads;
+ extended_image_info *images;
+ std::vector<debug_event*> events;
+} team_debug_info;
+
+static team_debug_info sTeamDebugInfo;
+
+
+typedef struct signal_map_entry {
+ enum gdb_signal target;
+ int haiku;
+} signal_map_entry;
+
+static const signal_map_entry sSignalMap[] = {
+ { GDB_SIGNAL_0, 0 },
+ { GDB_SIGNAL_HUP, SIGHUP },
+ { GDB_SIGNAL_INT, SIGINT },
+ { GDB_SIGNAL_QUIT, SIGQUIT },
+ { GDB_SIGNAL_ILL, SIGILL },
+ { GDB_SIGNAL_CHLD, SIGCHLD },
+ { GDB_SIGNAL_ABRT, SIGABRT },
+ { GDB_SIGNAL_PIPE, SIGPIPE },
+ { GDB_SIGNAL_FPE, SIGFPE },
+ { GDB_SIGNAL_KILL, SIGKILL },
+ { GDB_SIGNAL_STOP, SIGSTOP },
+ { GDB_SIGNAL_SEGV, SIGSEGV },
+ { GDB_SIGNAL_CONT, SIGCONT },
+ { GDB_SIGNAL_TSTP, SIGTSTP },
+ { GDB_SIGNAL_ALRM, SIGALRM },
+ { GDB_SIGNAL_TERM, SIGTERM },
+ { GDB_SIGNAL_TTIN, SIGTTIN },
+ { GDB_SIGNAL_TTOU, SIGTTOU },
+ { GDB_SIGNAL_USR1, SIGUSR1 },
+ { GDB_SIGNAL_USR2, SIGUSR2 },
+ { GDB_SIGNAL_WINCH, SIGWINCH },
+ { GDB_SIGNAL_TRAP, SIGTRAP },
+ { GDB_SIGNAL_0, SIGKILLTHR }, // not debuggable anyway
+ { (gdb_signal)-1, (gdb_signal)-1 }
+};
+
+
+// #pragma mark -
+
+
+static const char *haiku_pid_to_str (target_ops* ops, ptid_t ptid);
+
+
+static int
+target_to_haiku_signal(enum gdb_signal targetSignal)
+{
+ int i;
+
+ if (targetSignal < 0)
+ return -1;
+
+ for (i = 0; sSignalMap[i].target != -1 || sSignalMap[i].haiku != -1; i++) {
+ if (targetSignal == sSignalMap[i].target)
+ return sSignalMap[i].haiku;
+ }
+
+ return -1;
+}
+
+
+static enum gdb_signal
+haiku_to_target_signal(int haikuSignal)
+{
+ int i;
+
+ if (haikuSignal < 0)
+ return GDB_SIGNAL_0;
+
+ for (i = 0; sSignalMap[i].target != -1 || sSignalMap[i].haiku != -1; i++) {
+ if (haikuSignal == sSignalMap[i].haiku)
+ return sSignalMap[i].target;
+ }
+
+ return GDB_SIGNAL_UNKNOWN;
+}
+
+
+static thread_debug_info *
+haiku_find_thread(team_debug_info *teamDebugInfo, thread_id threadID)
+{
+ for (thread_debug_info *info : teamDebugInfo->threads) {
+ if (info->thread == threadID)
+ return info;
+ }
+
+ return NULL;
+}
+
+
+static thread_debug_info *
+haiku_add_thread(team_debug_info *teamDebugInfo, thread_id threadID)
+{
+ thread_info *gdbThreadInfo;
+ thread_debug_info *threadDebugInfo;
+
+ if (threadID == teamDebugInfo->nub_thread) {
+ error("haiku_thread_added(): Trying to add debug nub thread (%ld)\n",
+ threadID);
+ }
+
+ // find the thread first
+ threadDebugInfo = haiku_find_thread(teamDebugInfo, threadID);
+ if (threadDebugInfo)
+ return threadDebugInfo;
+
+ // allocate a new thread debug info
+ threadDebugInfo = new thread_debug_info;
+ if (!threadDebugInfo)
+ error("haiku_thread_added(): Out of memory!\n");
+
+ // init and add it
+ threadDebugInfo->thread = threadID;
+ threadDebugInfo->stopped = false;
+ threadDebugInfo->last_event = NULL;
+ teamDebugInfo->threads.push_back(threadDebugInfo);
+
+ // add it to gdb's thread DB
+ gdbThreadInfo = add_thread(ptid_build(teamDebugInfo->team, 0, threadID));
+
+ // Note: In theory we could spare us the whole thread list management, since
+ // gdb's thread DB is doing exactly the same. We could put our data as
+ // haiku_thread_info::private. The only catch is that when the haiku_thread_info is
+ // freed, xfree() is invoked on the private data directly, but there's no
+ // callback invoked before that would allow us to do cleanup (e.g. free
+ // last_event).
+
+ TRACE(("haiku_add_thread(): team %ld thread %ld added: "
+ "gdb thread info: %p\n", teamDebugInfo->team, threadID, gdbThreadInfo));
+
+ return threadDebugInfo;
+}
+
+
+static void
+haiku_remove_thread(team_debug_info *teamDebugInfo, thread_id threadID)
+{
+ for (size_t i = 0; i < teamDebugInfo->threads.size(); i++) {
+ thread_debug_info *info = teamDebugInfo->threads[i];
+ if (info->thread == threadID) {
+ if (info->last_event)
+ delete info->last_event;
+ delete info;
+ teamDebugInfo->threads.erase(teamDebugInfo->threads.begin() + i);
+
+ // remove it from gdb's thread DB
+ delete_thread(ptid_build(teamDebugInfo->team, 0, threadID));
+
+ return;
+ }
+ }
+}
+
+
+static void
+haiku_init_thread_list(team_debug_info *teamDebugInfo)
+{
+ haiku_thread_info threadInfo;
+ int32 cookie = 0;
+
+ // init gdb's thread DB
+ init_thread_list();
+
+ while (get_next_thread_info(teamDebugInfo->team, &cookie, &threadInfo)
+ == B_OK) {
+ if (threadInfo.thread != teamDebugInfo->nub_thread)
+ haiku_add_thread(teamDebugInfo, threadInfo.thread);
+ }
+}
+
+
+static void
+haiku_cleanup_thread_list(team_debug_info *teamDebugInfo)
+{
+ for (thread_debug_info *thread : teamDebugInfo->threads)
+ delete thread;
+ teamDebugInfo->threads.clear();
+
+ // clear gdb's thread DB
+ init_thread_list();
+}
+
+
+// #pragma mark -
+
+static extended_image_info **
+haiku_find_image_insert_location(team_debug_info *teamDebugInfo,
+ image_id imageID)
+{
+ extended_image_info **image;
+
+ for (image = &teamDebugInfo->images; *image; image = &(*image)->next) {
+ if ((*image)->info.id >= imageID)
+ return image;
+ }
+
+ return image;
+}
+
+
+static extended_image_info *
+haiku_find_image(team_debug_info *teamDebugInfo, image_id imageID)
+{
+ extended_image_info *image = *haiku_find_image_insert_location(
+ teamDebugInfo, imageID);
+
+ return (image && image->info.id == imageID ? image : NULL);
+}
+
+
+static extended_image_info *
+haiku_add_image(team_debug_info *teamDebugInfo, image_info *imageInfo)
+{
+ extended_image_info **imageP = haiku_find_image_insert_location(
+ teamDebugInfo, imageInfo->id);
+ extended_image_info *image = *imageP;
+
+ // already known?
+ if (image && image->info.id == imageInfo->id)
+ return image;
+
+ image = new extended_image_info;
+ if (!image)
+ error("haiku_add_image(): Out of memory!");
+
+ image->info.id = imageInfo->id;
+ strncpy(image->info.name, imageInfo->name, sizeof(image->info.name));
+ image->info.name[sizeof(image->info.name) - 1] = '\0';
+ // TODO: This should be the shared objects soname, not the path. We
+ // probably need to extend the debugger API.
+ strncpy(image->info.path, imageInfo->name, sizeof(image->info.path));
+ image->info.path[sizeof(image->info.path) - 1] = '\0';
+ image->info.text_address = (CORE_ADDR)imageInfo->text;
+ image->info.text_size = imageInfo->text_size;
+ image->info.data_address = (CORE_ADDR)imageInfo->data;
+ image->info.data_size = imageInfo->data_size;
+ image->info.is_app_image = (imageInfo->type == B_APP_IMAGE);
+
+ image->next = *imageP;
+ *imageP = image;
+
+ return image;
+}
+
+
+static void
+haiku_remove_image(team_debug_info *teamDebugInfo, image_id imageID)
+{
+ extended_image_info **imageP = haiku_find_image_insert_location(
+ teamDebugInfo, imageID);
+ extended_image_info *image = *imageP;
+
+ if (image && image->info.id == imageID) {
+ *imageP = image->next;
+ xfree(image);
+ }
+}
+
+
+static void
+haiku_init_image_list(team_debug_info *teamDebugInfo)
+{
+ int32 cookie = 0;
+ image_info info;
+ while (get_next_image_info(teamDebugInfo->team, &cookie, &info) == B_OK)
+ haiku_add_image(teamDebugInfo, &info);
+}
+
+
+static void
+haiku_cleanup_image_list(team_debug_info *teamDebugInfo)
+{
+ while (teamDebugInfo->images) {
+ extended_image_info *image = teamDebugInfo->images;
+ teamDebugInfo->images = image->next;
+ xfree(image);
+ }
+}
+
+
+/*
+ * Service function. Call with -1 the first time.
+ */
+haiku_image_info *
+haiku_get_next_image_info(int lastID)
+{
+ extended_image_info *image = *haiku_find_image_insert_location(
+ &sTeamDebugInfo, (lastID >= 0 ? lastID : 0));
+
+ if (image && image->info.id == lastID)
+ image = image->next;
+
+ return (image ? &image->info : NULL);
+}
+