Open Firmware

Open Firmware Commit Details

Date:2014-04-29 23:06:32 (5 months 21 days ago)
Author:tooch
Commit:3725
Parents: 3724
Message:core - Tiny lint fixes, detected on Apple LLVM-based SDK. And one not so tiny, as OS X dropped support for sbrk().
Changes:
M/cpu/arm/armsim.c
M/cpu/arm/build/Makefile
M/cpu/x86/build/Makefile
M/forth/wrapper/wrapper.c

File differences

cpu/x86/build/Makefile
2424
2525
2626
27
27
28
29
# Don't use *.dic so as not to remove builder.dic
clean:
rm -f tools.dic kernel.dic basefw.dic *.log headers *~ inflate.bin build
rm -f tools.dic kernel.dic basefw.dic
rm -f *.tag *.log headers *~ inflate.bin build
make -C ../${OS} clean
cpu/arm/build/Makefile
3232
3333
3434
35
36
35
36
37
38
# Don't use *.dic so as not to remove builder.dic
clean:
rm -f tools.dic kernel.dic basefw.dic *.log headers *~ inflate.bin build *.tag
make -C ../${OS} clean
rm -f tools.dic kernel.dic basefw.dic
rm -f *.tag *.log headers *~ inflate.bin build
@make -C ../${OS} clean
@make -C ${HOSTDIR} clean
cpu/arm/armsim.c
318318
319319
320320
321
321
322322
323323
324324
......
448448
449449
450450
451
452
451
452
453453
454454
455455
456
456
457457
458458
459459
......
516516
517517
518518
519
519
520520
521521
522522
register u32 res;
register u32 cond;
register u32 temp;
u32 indent = 0;
s32 indent = 0;
u32 name;
u32 namelen;
// u32 last_pc;
switch (BXTYPE) {
// P=0, U=1, bit22=0, W=0 - post-index, subtract offset, register, no writeback
case 0x9: INSTR("umull");
{ unsigned long long result;
result = (unsigned long long)RM * (unsigned long long)RS;
{ u64 result;
result = (u64)RM * (u64)RS;
RN = (u32)((result >> 32) & 0xffffffffLL);
RD = (u32)(result & 0xffffffffLL);
if (S) {
N = (result < 0);
N = (RN & 0x80000000LL) ? 1 : 0;
Z = (result == 0);
}
}
case 0x5:
case 0x7: INSTR("sbc"); SHFT(res); SBB(RD, res, RN, C); break;
case 0x9: INSTR("smull");
{ long long result, a, b;
{ s64 result, a, b;
a = (int)RM;
b = (int)RS;
result = a * b;
forth/wrapper/wrapper.c
21112111
21122112
21132113
2114
2115
2116
2117
21142118
2119
21152120
21162121
21172122
INTERNAL long
m_sbrk(long size)
{
#ifdef __APPLE__
perror("forth: sbrk is no longer supported on Mac OS X 10.9\n");
exit(1);
#else // Other UNIXs still support sbrk()
return((long)sbrk(size));
#endif
}
#endif

Archive Download the corresponding diff file

Revision: 3725