Author: tooch Date: Tue Apr 29 23:06:32 2014 New Revision: 3725 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3725
Log: core - Tiny lint fixes, detected on Apple LLVM-based SDK. And one not so tiny, as OS X dropped support for sbrk().
Modified: cpu/arm/armsim.c cpu/arm/build/Makefile cpu/x86/build/Makefile forth/wrapper/wrapper.c
Modified: cpu/arm/armsim.c ============================================================================== --- cpu/arm/armsim.c Thu Apr 17 06:51:19 2014 (r3724) +++ cpu/arm/armsim.c Tue Apr 29 23:06:32 2014 (r3725) @@ -318,7 +318,7 @@ register u32 res; register u32 cond; register u32 temp; - u32 indent = 0; + s32 indent = 0; u32 name; u32 namelen; // u32 last_pc; @@ -448,12 +448,12 @@ 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); } } @@ -516,7 +516,7 @@ 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;
Modified: cpu/arm/build/Makefile ============================================================================== --- cpu/arm/build/Makefile Thu Apr 17 06:51:19 2014 (r3724) +++ cpu/arm/build/Makefile Tue Apr 29 23:06:32 2014 (r3725) @@ -32,5 +32,7 @@
# 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
Modified: cpu/x86/build/Makefile ============================================================================== --- cpu/x86/build/Makefile Thu Apr 17 06:51:19 2014 (r3724) +++ cpu/x86/build/Makefile Tue Apr 29 23:06:32 2014 (r3725) @@ -24,4 +24,6 @@
# 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
Modified: forth/wrapper/wrapper.c ============================================================================== --- forth/wrapper/wrapper.c Thu Apr 17 06:51:19 2014 (r3724) +++ forth/wrapper/wrapper.c Tue Apr 29 23:06:32 2014 (r3725) @@ -2111,7 +2111,12 @@ 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