Skip to content

Commit 40b36e6

Browse files
GrieferAtWorkGrieferAtWork
committed
Rename files for old slab system
To prevent conflicts as I work on the new system
1 parent 1b6ca61 commit 40b36e6

File tree

9 files changed

+46
-46
lines changed

9 files changed

+46
-46
lines changed

‎.vs/deemon-v141.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -491,11 +491,11 @@
491491
<ClInclude Include="..\src\deemon\runtime\method-hints.h" />
492492
<ClInclude Include="..\src\deemon\runtime\mro-impl-cache.c.inl" />
493493
<ClInclude Include="..\src\deemon\runtime\mro-impl.c.inl" />
494+
<ClInclude Include="..\src\deemon\runtime\old-slab-impl.c.inl" />
495+
<ClInclude Include="..\src\deemon\runtime\old-slab.c.inl" />
494496
<ClInclude Include="..\src\deemon\runtime\operator-hint-errors.h" />
495497
<ClInclude Include="..\src\deemon\runtime\refcnt-destroy.c.inl" />
496498
<ClInclude Include="..\src\deemon\runtime\runtime_error.h" />
497-
<ClInclude Include="..\src\deemon\runtime\slab-impl.c.inl" />
498-
<ClInclude Include="..\src\deemon\runtime\slab.c.inl" />
499499
<ClInclude Include="..\src\deemon\runtime\strings.h" />
500500
<ClInclude Include="..\src\deemon\system\futex-controller-new.c.inl" />
501501
<ClInclude Include="..\src\deemon\system\futex-wait.c.inl" />

‎.vs/deemon-v141.vcxproj.filters‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1449,19 +1449,19 @@
14491449
<ClInclude Include="..\src\deemon\runtime\mro-impl.c.inl">
14501450
<Filter>src\runtime</Filter>
14511451
</ClInclude>
1452-
<ClInclude Include="..\src\deemon\runtime\operator-hint-errors.h">
1452+
<ClInclude Include="..\src\deemon\runtime\old-slab-impl.c.inl">
14531453
<Filter>src\runtime</Filter>
14541454
</ClInclude>
1455-
<ClInclude Include="..\src\deemon\runtime\refcnt-destroy.c.inl">
1455+
<ClInclude Include="..\src\deemon\runtime\old-slab.c.inl">
14561456
<Filter>src\runtime</Filter>
14571457
</ClInclude>
1458-
<ClInclude Include="..\src\deemon\runtime\runtime_error.h">
1458+
<ClInclude Include="..\src\deemon\runtime\operator-hint-errors.h">
14591459
<Filter>src\runtime</Filter>
14601460
</ClInclude>
1461-
<ClInclude Include="..\src\deemon\runtime\slab-impl.c.inl">
1461+
<ClInclude Include="..\src\deemon\runtime\refcnt-destroy.c.inl">
14621462
<Filter>src\runtime</Filter>
14631463
</ClInclude>
1464-
<ClInclude Include="..\src\deemon\runtime\slab.c.inl">
1464+
<ClInclude Include="..\src\deemon\runtime\runtime_error.h">
14651465
<Filter>src\runtime</Filter>
14661466
</ClInclude>
14671467
<ClInclude Include="..\src\deemon\runtime\strings.h">

‎.vs/deemon-v142.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -491,11 +491,11 @@
491491
<ClInclude Include="..\src\deemon\runtime\method-hints.h" />
492492
<ClInclude Include="..\src\deemon\runtime\mro-impl-cache.c.inl" />
493493
<ClInclude Include="..\src\deemon\runtime\mro-impl.c.inl" />
494+
<ClInclude Include="..\src\deemon\runtime\old-slab-impl.c.inl" />
495+
<ClInclude Include="..\src\deemon\runtime\old-slab.c.inl" />
494496
<ClInclude Include="..\src\deemon\runtime\operator-hint-errors.h" />
495497
<ClInclude Include="..\src\deemon\runtime\refcnt-destroy.c.inl" />
496498
<ClInclude Include="..\src\deemon\runtime\runtime_error.h" />
497-
<ClInclude Include="..\src\deemon\runtime\slab-impl.c.inl" />
498-
<ClInclude Include="..\src\deemon\runtime\slab.c.inl" />
499499
<ClInclude Include="..\src\deemon\runtime\strings.h" />
500500
<ClInclude Include="..\src\deemon\system\futex-controller-new.c.inl" />
501501
<ClInclude Include="..\src\deemon\system\futex-wait.c.inl" />

‎.vs/deemon-v142.vcxproj.filters‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1449,19 +1449,19 @@
14491449
<ClInclude Include="..\src\deemon\runtime\mro-impl.c.inl">
14501450
<Filter>src\runtime</Filter>
14511451
</ClInclude>
1452-
<ClInclude Include="..\src\deemon\runtime\operator-hint-errors.h">
1452+
<ClInclude Include="..\src\deemon\runtime\old-slab-impl.c.inl">
14531453
<Filter>src\runtime</Filter>
14541454
</ClInclude>
1455-
<ClInclude Include="..\src\deemon\runtime\refcnt-destroy.c.inl">
1455+
<ClInclude Include="..\src\deemon\runtime\old-slab.c.inl">
14561456
<Filter>src\runtime</Filter>
14571457
</ClInclude>
1458-
<ClInclude Include="..\src\deemon\runtime\runtime_error.h">
1458+
<ClInclude Include="..\src\deemon\runtime\operator-hint-errors.h">
14591459
<Filter>src\runtime</Filter>
14601460
</ClInclude>
1461-
<ClInclude Include="..\src\deemon\runtime\slab-impl.c.inl">
1461+
<ClInclude Include="..\src\deemon\runtime\refcnt-destroy.c.inl">
14621462
<Filter>src\runtime</Filter>
14631463
</ClInclude>
1464-
<ClInclude Include="..\src\deemon\runtime\slab.c.inl">
1464+
<ClInclude Include="..\src\deemon\runtime\runtime_error.h">
14651465
<Filter>src\runtime</Filter>
14661466
</ClInclude>
14671467
<ClInclude Include="..\src\deemon\runtime\strings.h">

‎.vs/deemon-v143.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -491,11 +491,11 @@
491491
<ClInclude Include="..\src\deemon\runtime\method-hints.h" />
492492
<ClInclude Include="..\src\deemon\runtime\mro-impl-cache.c.inl" />
493493
<ClInclude Include="..\src\deemon\runtime\mro-impl.c.inl" />
494+
<ClInclude Include="..\src\deemon\runtime\old-slab-impl.c.inl" />
495+
<ClInclude Include="..\src\deemon\runtime\old-slab.c.inl" />
494496
<ClInclude Include="..\src\deemon\runtime\operator-hint-errors.h" />
495497
<ClInclude Include="..\src\deemon\runtime\refcnt-destroy.c.inl" />
496498
<ClInclude Include="..\src\deemon\runtime\runtime_error.h" />
497-
<ClInclude Include="..\src\deemon\runtime\slab-impl.c.inl" />
498-
<ClInclude Include="..\src\deemon\runtime\slab.c.inl" />
499499
<ClInclude Include="..\src\deemon\runtime\strings.h" />
500500
<ClInclude Include="..\src\deemon\system\futex-controller-new.c.inl" />
501501
<ClInclude Include="..\src\deemon\system\futex-wait.c.inl" />

‎.vs/deemon-v143.vcxproj.filters‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1449,19 +1449,19 @@
14491449
<ClInclude Include="..\src\deemon\runtime\mro-impl.c.inl">
14501450
<Filter>src\runtime</Filter>
14511451
</ClInclude>
1452-
<ClInclude Include="..\src\deemon\runtime\operator-hint-errors.h">
1452+
<ClInclude Include="..\src\deemon\runtime\old-slab-impl.c.inl">
14531453
<Filter>src\runtime</Filter>
14541454
</ClInclude>
1455-
<ClInclude Include="..\src\deemon\runtime\refcnt-destroy.c.inl">
1455+
<ClInclude Include="..\src\deemon\runtime\old-slab.c.inl">
14561456
<Filter>src\runtime</Filter>
14571457
</ClInclude>
1458-
<ClInclude Include="..\src\deemon\runtime\runtime_error.h">
1458+
<ClInclude Include="..\src\deemon\runtime\operator-hint-errors.h">
14591459
<Filter>src\runtime</Filter>
14601460
</ClInclude>
1461-
<ClInclude Include="..\src\deemon\runtime\slab-impl.c.inl">
1461+
<ClInclude Include="..\src\deemon\runtime\refcnt-destroy.c.inl">
14621462
<Filter>src\runtime</Filter>
14631463
</ClInclude>
1464-
<ClInclude Include="..\src\deemon\runtime\slab.c.inl">
1464+
<ClInclude Include="..\src\deemon\runtime\runtime_error.h">
14651465
<Filter>src\runtime</Filter>
14661466
</ClInclude>
14671467
<ClInclude Include="..\src\deemon\runtime\strings.h">

‎src/deemon/runtime/heap.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ ClCompile.BasicRuntimeChecks = Default
4444
#define ATTR_ALLOC_ALIGN(pari) /* Nothing */
4545

4646
#ifndef __INTELLISENSE__
47-
#include "slab.c.inl"
47+
#include "old-slab.c.inl"
4848
#endif /* !__INTELLISENSE__ */
4949

5050
#ifdef CONFIG_EXPERIMENTAL_CUSTOM_HEAP

src/deemon/runtime/slab-impl.c.inl renamed to src/deemon/runtime/old-slab-impl.c.inl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* 3. This notice may not be removed or altered from any source distribution. *
1919
*/
2020
#ifdef __INTELLISENSE__
21-
#include "slab.c.inl"
21+
#include "old-slab.c.inl"
2222
#define SIZE 4
2323
#define NEXT_LARGER 5
2424
#endif /* __INTELLISENSE__ */

src/deemon/runtime/slab.c.inl renamed to src/deemon/runtime/old-slab.c.inl

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
* misrepresented as being the original software. *
1818
* 3. This notice may not be removed or altered from any source distribution. *
1919
*/
20-
#ifndef GUARD_DEEMON_RUNTIME_SLAB_C_INL
21-
#define GUARD_DEEMON_RUNTIME_SLAB_C_INL 1
20+
#ifndef GUARD_DEEMON_RUNTIME_OLD_SLAB_C_INL
21+
#define GUARD_DEEMON_RUNTIME_OLD_SLAB_C_INL 1
2222

2323
#include <deemon/api.h>
2424

@@ -147,105 +147,105 @@ DECL_END
147147
for (local x = 20; x >= 2; x = x - 1) {
148148
print "#if DeeSlab_HasSize(" + x + ")";
149149
print "#define SIZE", x;
150-
print "#include \"slab-impl.c.inl\"";
150+
print "#include \"old-slab-impl.c.inl\"";
151151
print "#define NEXT_LARGER", x;
152152
print "#endif /" "* DeeSlab_HasSize(" + x + ") *" "/";
153153
}
154154
print "#undef NEXT_LARGER";
155155
]]]*/
156156
#if DeeSlab_HasSize(20)
157157
#define SIZE 20
158-
#include "slab-impl.c.inl"
158+
#include "old-slab-impl.c.inl"
159159
#define NEXT_LARGER 20
160160
#endif /* DeeSlab_HasSize(20) */
161161
#if DeeSlab_HasSize(19)
162162
#define SIZE 19
163-
#include "slab-impl.c.inl"
163+
#include "old-slab-impl.c.inl"
164164
#define NEXT_LARGER 19
165165
#endif /* DeeSlab_HasSize(19) */
166166
#if DeeSlab_HasSize(18)
167167
#define SIZE 18
168-
#include "slab-impl.c.inl"
168+
#include "old-slab-impl.c.inl"
169169
#define NEXT_LARGER 18
170170
#endif /* DeeSlab_HasSize(18) */
171171
#if DeeSlab_HasSize(17)
172172
#define SIZE 17
173-
#include "slab-impl.c.inl"
173+
#include "old-slab-impl.c.inl"
174174
#define NEXT_LARGER 17
175175
#endif /* DeeSlab_HasSize(17) */
176176
#if DeeSlab_HasSize(16)
177177
#define SIZE 16
178-
#include "slab-impl.c.inl"
178+
#include "old-slab-impl.c.inl"
179179
#define NEXT_LARGER 16
180180
#endif /* DeeSlab_HasSize(16) */
181181
#if DeeSlab_HasSize(15)
182182
#define SIZE 15
183-
#include "slab-impl.c.inl"
183+
#include "old-slab-impl.c.inl"
184184
#define NEXT_LARGER 15
185185
#endif /* DeeSlab_HasSize(15) */
186186
#if DeeSlab_HasSize(14)
187187
#define SIZE 14
188-
#include "slab-impl.c.inl"
188+
#include "old-slab-impl.c.inl"
189189
#define NEXT_LARGER 14
190190
#endif /* DeeSlab_HasSize(14) */
191191
#if DeeSlab_HasSize(13)
192192
#define SIZE 13
193-
#include "slab-impl.c.inl"
193+
#include "old-slab-impl.c.inl"
194194
#define NEXT_LARGER 13
195195
#endif /* DeeSlab_HasSize(13) */
196196
#if DeeSlab_HasSize(12)
197197
#define SIZE 12
198-
#include "slab-impl.c.inl"
198+
#include "old-slab-impl.c.inl"
199199
#define NEXT_LARGER 12
200200
#endif /* DeeSlab_HasSize(12) */
201201
#if DeeSlab_HasSize(11)
202202
#define SIZE 11
203-
#include "slab-impl.c.inl"
203+
#include "old-slab-impl.c.inl"
204204
#define NEXT_LARGER 11
205205
#endif /* DeeSlab_HasSize(11) */
206206
#if DeeSlab_HasSize(10)
207207
#define SIZE 10
208-
#include "slab-impl.c.inl"
208+
#include "old-slab-impl.c.inl"
209209
#define NEXT_LARGER 10
210210
#endif /* DeeSlab_HasSize(10) */
211211
#if DeeSlab_HasSize(9)
212212
#define SIZE 9
213-
#include "slab-impl.c.inl"
213+
#include "old-slab-impl.c.inl"
214214
#define NEXT_LARGER 9
215215
#endif /* DeeSlab_HasSize(9) */
216216
#if DeeSlab_HasSize(8)
217217
#define SIZE 8
218-
#include "slab-impl.c.inl"
218+
#include "old-slab-impl.c.inl"
219219
#define NEXT_LARGER 8
220220
#endif /* DeeSlab_HasSize(8) */
221221
#if DeeSlab_HasSize(7)
222222
#define SIZE 7
223-
#include "slab-impl.c.inl"
223+
#include "old-slab-impl.c.inl"
224224
#define NEXT_LARGER 7
225225
#endif /* DeeSlab_HasSize(7) */
226226
#if DeeSlab_HasSize(6)
227227
#define SIZE 6
228-
#include "slab-impl.c.inl"
228+
#include "old-slab-impl.c.inl"
229229
#define NEXT_LARGER 6
230230
#endif /* DeeSlab_HasSize(6) */
231231
#if DeeSlab_HasSize(5)
232232
#define SIZE 5
233-
#include "slab-impl.c.inl"
233+
#include "old-slab-impl.c.inl"
234234
#define NEXT_LARGER 5
235235
#endif /* DeeSlab_HasSize(5) */
236236
#if DeeSlab_HasSize(4)
237237
#define SIZE 4
238-
#include "slab-impl.c.inl"
238+
#include "old-slab-impl.c.inl"
239239
#define NEXT_LARGER 4
240240
#endif /* DeeSlab_HasSize(4) */
241241
#if DeeSlab_HasSize(3)
242242
#define SIZE 3
243-
#include "slab-impl.c.inl"
243+
#include "old-slab-impl.c.inl"
244244
#define NEXT_LARGER 3
245245
#endif /* DeeSlab_HasSize(3) */
246246
#if DeeSlab_HasSize(2)
247247
#define SIZE 2
248-
#include "slab-impl.c.inl"
248+
#include "old-slab-impl.c.inl"
249249
#define NEXT_LARGER 2
250250
#endif /* DeeSlab_HasSize(2) */
251251
#undef NEXT_LARGER
@@ -476,4 +476,4 @@ disable_slabs:
476476
DECL_END
477477
#endif /* !CONFIG_NO_OBJECT_SLABS */
478478

479-
#endif /* !GUARD_DEEMON_RUNTIME_SLAB_C_INL */
479+
#endif /* !GUARD_DEEMON_RUNTIME_OLD_SLAB_C_INL */

0 commit comments

Comments
 (0)