Skip to content

Commit f89ee85

Browse files
Andrew HsiehGerrit Code Review
Andrew Hsieh
authored and
Gerrit Code Review
committed
Merge "Fix mips/mips64 headers"
2 parents b440125 + 29fe2de commit f89ee85

File tree

8 files changed

+454
-0
lines changed

8 files changed

+454
-0
lines changed

‎ndk/platforms/android-21/arch-mips/include/asm/reg.h

Lines changed: 223 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,223 @@
1+
/****************************************************************************
2+
****************************************************************************
3+
***
4+
*** This header was automatically generated from a Linux kernel header
5+
*** of the same name, to make information necessary for userspace to
6+
*** call into the kernel available to libc. It contains only constants,
7+
*** structures, and macros generated from the original header, and thus,
8+
*** contains no copyrightable information.
9+
***
10+
*** To edit the content of this header, modify the corresponding
11+
*** source file (e.g. under external/kernel-headers/original/) then
12+
*** run bionic/libc/kernel/tools/update_all.py
13+
***
14+
*** Any manual change here will be lost the next time this script will
15+
*** be run. You've been warned!
16+
***
17+
****************************************************************************
18+
****************************************************************************/
19+
#ifndef __UAPI_ASM_MIPS_REG_H
20+
#define __UAPI_ASM_MIPS_REG_H
21+
#define MIPS32_EF_R0 6
22+
#define MIPS32_EF_R1 7
23+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
24+
#define MIPS32_EF_R2 8
25+
#define MIPS32_EF_R3 9
26+
#define MIPS32_EF_R4 10
27+
#define MIPS32_EF_R5 11
28+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
29+
#define MIPS32_EF_R6 12
30+
#define MIPS32_EF_R7 13
31+
#define MIPS32_EF_R8 14
32+
#define MIPS32_EF_R9 15
33+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
34+
#define MIPS32_EF_R10 16
35+
#define MIPS32_EF_R11 17
36+
#define MIPS32_EF_R12 18
37+
#define MIPS32_EF_R13 19
38+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
39+
#define MIPS32_EF_R14 20
40+
#define MIPS32_EF_R15 21
41+
#define MIPS32_EF_R16 22
42+
#define MIPS32_EF_R17 23
43+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
44+
#define MIPS32_EF_R18 24
45+
#define MIPS32_EF_R19 25
46+
#define MIPS32_EF_R20 26
47+
#define MIPS32_EF_R21 27
48+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
49+
#define MIPS32_EF_R22 28
50+
#define MIPS32_EF_R23 29
51+
#define MIPS32_EF_R24 30
52+
#define MIPS32_EF_R25 31
53+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
54+
#define MIPS32_EF_R26 32
55+
#define MIPS32_EF_R27 33
56+
#define MIPS32_EF_R28 34
57+
#define MIPS32_EF_R29 35
58+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
59+
#define MIPS32_EF_R30 36
60+
#define MIPS32_EF_R31 37
61+
#define MIPS32_EF_LO 38
62+
#define MIPS32_EF_HI 39
63+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
64+
#define MIPS32_EF_CP0_EPC 40
65+
#define MIPS32_EF_CP0_BADVADDR 41
66+
#define MIPS32_EF_CP0_STATUS 42
67+
#define MIPS32_EF_CP0_CAUSE 43
68+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
69+
#define MIPS32_EF_UNUSED0 44
70+
#define MIPS32_EF_SIZE 180
71+
#define MIPS64_EF_R0 0
72+
#define MIPS64_EF_R1 1
73+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
74+
#define MIPS64_EF_R2 2
75+
#define MIPS64_EF_R3 3
76+
#define MIPS64_EF_R4 4
77+
#define MIPS64_EF_R5 5
78+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
79+
#define MIPS64_EF_R6 6
80+
#define MIPS64_EF_R7 7
81+
#define MIPS64_EF_R8 8
82+
#define MIPS64_EF_R9 9
83+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
84+
#define MIPS64_EF_R10 10
85+
#define MIPS64_EF_R11 11
86+
#define MIPS64_EF_R12 12
87+
#define MIPS64_EF_R13 13
88+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
89+
#define MIPS64_EF_R14 14
90+
#define MIPS64_EF_R15 15
91+
#define MIPS64_EF_R16 16
92+
#define MIPS64_EF_R17 17
93+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
94+
#define MIPS64_EF_R18 18
95+
#define MIPS64_EF_R19 19
96+
#define MIPS64_EF_R20 20
97+
#define MIPS64_EF_R21 21
98+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
99+
#define MIPS64_EF_R22 22
100+
#define MIPS64_EF_R23 23
101+
#define MIPS64_EF_R24 24
102+
#define MIPS64_EF_R25 25
103+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
104+
#define MIPS64_EF_R26 26
105+
#define MIPS64_EF_R27 27
106+
#define MIPS64_EF_R28 28
107+
#define MIPS64_EF_R29 29
108+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
109+
#define MIPS64_EF_R30 30
110+
#define MIPS64_EF_R31 31
111+
#define MIPS64_EF_LO 32
112+
#define MIPS64_EF_HI 33
113+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
114+
#define MIPS64_EF_CP0_EPC 34
115+
#define MIPS64_EF_CP0_BADVADDR 35
116+
#define MIPS64_EF_CP0_STATUS 36
117+
#define MIPS64_EF_CP0_CAUSE 37
118+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
119+
#define MIPS64_EF_SIZE 304
120+
#if _MIPS_SIM == _MIPS_SIM_ABI32
121+
#define EF_R0 MIPS32_EF_R0
122+
#define EF_R1 MIPS32_EF_R1
123+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
124+
#define EF_R2 MIPS32_EF_R2
125+
#define EF_R3 MIPS32_EF_R3
126+
#define EF_R4 MIPS32_EF_R4
127+
#define EF_R5 MIPS32_EF_R5
128+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
129+
#define EF_R6 MIPS32_EF_R6
130+
#define EF_R7 MIPS32_EF_R7
131+
#define EF_R8 MIPS32_EF_R8
132+
#define EF_R9 MIPS32_EF_R9
133+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
134+
#define EF_R10 MIPS32_EF_R10
135+
#define EF_R11 MIPS32_EF_R11
136+
#define EF_R12 MIPS32_EF_R12
137+
#define EF_R13 MIPS32_EF_R13
138+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
139+
#define EF_R14 MIPS32_EF_R14
140+
#define EF_R15 MIPS32_EF_R15
141+
#define EF_R16 MIPS32_EF_R16
142+
#define EF_R17 MIPS32_EF_R17
143+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
144+
#define EF_R18 MIPS32_EF_R18
145+
#define EF_R19 MIPS32_EF_R19
146+
#define EF_R20 MIPS32_EF_R20
147+
#define EF_R21 MIPS32_EF_R21
148+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
149+
#define EF_R22 MIPS32_EF_R22
150+
#define EF_R23 MIPS32_EF_R23
151+
#define EF_R24 MIPS32_EF_R24
152+
#define EF_R25 MIPS32_EF_R25
153+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
154+
#define EF_R26 MIPS32_EF_R26
155+
#define EF_R27 MIPS32_EF_R27
156+
#define EF_R28 MIPS32_EF_R28
157+
#define EF_R29 MIPS32_EF_R29
158+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
159+
#define EF_R30 MIPS32_EF_R30
160+
#define EF_R31 MIPS32_EF_R31
161+
#define EF_LO MIPS32_EF_LO
162+
#define EF_HI MIPS32_EF_HI
163+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
164+
#define EF_CP0_EPC MIPS32_EF_CP0_EPC
165+
#define EF_CP0_BADVADDR MIPS32_EF_CP0_BADVADDR
166+
#define EF_CP0_STATUS MIPS32_EF_CP0_STATUS
167+
#define EF_CP0_CAUSE MIPS32_EF_CP0_CAUSE
168+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
169+
#define EF_UNUSED0 MIPS32_EF_UNUSED0
170+
#define EF_SIZE MIPS32_EF_SIZE
171+
#elif _MIPS_SIM==_MIPS_SIM_ABI64||_MIPS_SIM==_MIPS_SIM_NABI32
172+
#define EF_R0 MIPS64_EF_R0
173+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
174+
#define EF_R1 MIPS64_EF_R1
175+
#define EF_R2 MIPS64_EF_R2
176+
#define EF_R3 MIPS64_EF_R3
177+
#define EF_R4 MIPS64_EF_R4
178+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
179+
#define EF_R5 MIPS64_EF_R5
180+
#define EF_R6 MIPS64_EF_R6
181+
#define EF_R7 MIPS64_EF_R7
182+
#define EF_R8 MIPS64_EF_R8
183+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
184+
#define EF_R9 MIPS64_EF_R9
185+
#define EF_R10 MIPS64_EF_R10
186+
#define EF_R11 MIPS64_EF_R11
187+
#define EF_R12 MIPS64_EF_R12
188+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
189+
#define EF_R13 MIPS64_EF_R13
190+
#define EF_R14 MIPS64_EF_R14
191+
#define EF_R15 MIPS64_EF_R15
192+
#define EF_R16 MIPS64_EF_R16
193+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
194+
#define EF_R17 MIPS64_EF_R17
195+
#define EF_R18 MIPS64_EF_R18
196+
#define EF_R19 MIPS64_EF_R19
197+
#define EF_R20 MIPS64_EF_R20
198+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
199+
#define EF_R21 MIPS64_EF_R21
200+
#define EF_R22 MIPS64_EF_R22
201+
#define EF_R23 MIPS64_EF_R23
202+
#define EF_R24 MIPS64_EF_R24
203+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
204+
#define EF_R25 MIPS64_EF_R25
205+
#define EF_R26 MIPS64_EF_R26
206+
#define EF_R27 MIPS64_EF_R27
207+
#define EF_R28 MIPS64_EF_R28
208+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
209+
#define EF_R29 MIPS64_EF_R29
210+
#define EF_R30 MIPS64_EF_R30
211+
#define EF_R31 MIPS64_EF_R31
212+
#define EF_LO MIPS64_EF_LO
213+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
214+
#define EF_HI MIPS64_EF_HI
215+
#define EF_CP0_EPC MIPS64_EF_CP0_EPC
216+
#define EF_CP0_BADVADDR MIPS64_EF_CP0_BADVADDR
217+
#define EF_CP0_STATUS MIPS64_EF_CP0_STATUS
218+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
219+
#define EF_CP0_CAUSE MIPS64_EF_CP0_CAUSE
220+
#define EF_SIZE MIPS64_EF_SIZE
221+
#endif
222+
#endif
223+
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */

‎ndk/platforms/android-21/arch-mips/include/machine/elf_machdep.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@
121121
#define DT_MIPS_GOTSYM 0x70000013 /* first dynamic sym in got */
122122
#define DT_MIPS_HIPAGENO 0x70000014
123123
#define DT_MIPS_RLD_MAP 0x70000016 /* address of loader map */
124+
#define DT_MIPS_RLD_MAP2 0x70000035 /* Address of run time loader map, used for debugging. */
125+
124126

125127
/*
126128
* ELF Flags

‎ndk/platforms/android-21/arch-mips/include/machine/exec.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@
9191
#define DT_MIPS_GOTSYM 0x70000013 /* First GOT entry in .dynsym */
9292
#define DT_MIPS_HIPAGENO 0x70000014 /* Number of GOT page table entries */
9393
#define DT_MIPS_RLD_MAP 0x70000016 /* Address of debug map pointer */
94+
#define DT_MIPS_RLD_MAP2 0x70000035 /* Address of run time loader map, used for debugging. */
9495

9596
#define DT_PROCNUM (DT_MIPS_RLD_MAP - DT_LOPROC + 1)
9697

0 commit comments

Comments
 (0)