Date: Fri, 30 Jan 2015 23:57:40 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r277956 - in projects/clang360-import: games/fortune/fortune lib/msun/src sys/boot/i386/libi386 sys/fs/smbfs sys/fs/udf sys/netgraph usr.sbin/bsdinstall/partedit Message-ID: <201501302357.t0UNveKL058674@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Fri Jan 30 23:57:39 2015 New Revision: 277956 URL: https://svnweb.freebsd.org/changeset/base/277956 Log: Merge ^/head r277945 through r277955. Modified: projects/clang360-import/games/fortune/fortune/fortune.6 projects/clang360-import/lib/msun/src/s_scalbln.c projects/clang360-import/sys/boot/i386/libi386/libi386.h projects/clang360-import/sys/boot/i386/libi386/smbios.c projects/clang360-import/sys/fs/smbfs/smbfs_subr.c projects/clang360-import/sys/fs/udf/udf_vnops.c projects/clang360-import/sys/netgraph/ng_parse.c projects/clang360-import/usr.sbin/bsdinstall/partedit/partedit_x86.c Directory Properties: projects/clang360-import/ (props changed) projects/clang360-import/sys/ (props changed) projects/clang360-import/sys/boot/ (props changed) Modified: projects/clang360-import/games/fortune/fortune/fortune.6 ============================================================================== --- projects/clang360-import/games/fortune/fortune/fortune.6 Fri Jan 30 23:38:08 2015 (r277955) +++ projects/clang360-import/games/fortune/fortune/fortune.6 Fri Jan 30 23:57:39 2015 (r277956) @@ -168,7 +168,7 @@ It is a colon-separated list of director .Nm looks for data files. If not set it will default to -.Pa /usr/games/fortune . +.Pa /usr/share/games/fortune . If none of the directories specified exist, it will print a warning and exit. .It Ev FORTUNE_SAVESTATE If set, fortune will save some state about what fortune Modified: projects/clang360-import/lib/msun/src/s_scalbln.c ============================================================================== --- projects/clang360-import/lib/msun/src/s_scalbln.c Fri Jan 30 23:38:08 2015 (r277955) +++ projects/clang360-import/lib/msun/src/s_scalbln.c Fri Jan 30 23:57:39 2015 (r277956) @@ -35,13 +35,7 @@ scalbln (double x, long n) { int in; - in = (int)n; - if (in != n) { - if (n > 0) - in = INT_MAX; - else - in = INT_MIN; - } + in = (n > INT_MAX) ? INT_MAX : (n < INT_MIN) ? INT_MIN : n; return (scalbn(x, in)); } @@ -50,13 +44,7 @@ scalblnf (float x, long n) { int in; - in = (int)n; - if (in != n) { - if (n > 0) - in = INT_MAX; - else - in = INT_MIN; - } + in = (n > INT_MAX) ? INT_MAX : (n < INT_MIN) ? INT_MIN : n; return (scalbnf(x, in)); } @@ -65,12 +53,6 @@ scalblnl (long double x, long n) { int in; - in = (int)n; - if (in != n) { - if (n > 0) - in = INT_MAX; - else - in = INT_MIN; - } - return (scalbnl(x, (int)n)); + in = (n > INT_MAX) ? INT_MAX : (n < INT_MIN) ? INT_MIN : n; + return (scalbnl(x, in)); } Modified: projects/clang360-import/sys/boot/i386/libi386/libi386.h ============================================================================== --- projects/clang360-import/sys/boot/i386/libi386/libi386.h Fri Jan 30 23:38:08 2015 (r277955) +++ projects/clang360-import/sys/boot/i386/libi386/libi386.h Fri Jan 30 23:57:39 2015 (r277956) @@ -114,6 +114,8 @@ uint32_t biospci_locator(int8_t bus, uin void biosacpi_detect(void); void smbios_detect(void); +int smbios_match(const char* bios_vendor, const char* maker, + const char* product); int i386_autoload(void); Modified: projects/clang360-import/sys/boot/i386/libi386/smbios.c ============================================================================== --- projects/clang360-import/sys/boot/i386/libi386/smbios.c Fri Jan 30 23:38:08 2015 (r277955) +++ projects/clang360-import/sys/boot/i386/libi386/smbios.c Fri Jan 30 23:57:39 2015 (r277956) @@ -64,10 +64,24 @@ __FBSDID("$FreeBSD$"); #define SMBIOS_GETLEN(base) SMBIOS_GET8(base, 0x01) #define SMBIOS_GETSTR(base) ((base) + SMBIOS_GETLEN(base)) -static uint32_t smbios_enabled_memory = 0; -static uint32_t smbios_old_enabled_memory = 0; -static uint8_t smbios_enabled_sockets = 0; -static uint8_t smbios_populated_sockets = 0; +struct smbios_attr { + int probed; + caddr_t addr; + size_t length; + size_t count; + int major; + int minor; + int ver; + const char* bios_vendor; + const char* maker; + const char* product; + uint32_t enabled_memory; + uint32_t old_enabled_memory; + uint8_t enabled_sockets; + uint8_t populated_sockets; +}; + +static struct smbios_attr smbios; static uint8_t smbios_checksum(const caddr_t addr, const uint8_t len) @@ -95,8 +109,8 @@ smbios_sigsearch(const caddr_t addr, con return (NULL); } -static void -smbios_setenv(const char *name, caddr_t addr, const int offset) +static const char* +smbios_getstring(caddr_t addr, const int offset) { caddr_t cp; int i, idx; @@ -106,8 +120,19 @@ smbios_setenv(const char *name, caddr_t cp = SMBIOS_GETSTR(addr); for (i = 1; i < idx; i++) cp += strlen(cp) + 1; - setenv(name, cp, 1); + return cp; } + return (NULL); +} + +static void +smbios_setenv(const char *name, caddr_t addr, const int offset) +{ + const char* val; + + val = smbios_getstring(addr, offset); + if (val != NULL) + setenv(name, val, 1); } #ifdef SMBIOS_SERIAL_NUMBERS @@ -187,7 +212,7 @@ smbios_setuuid(const char *name, const c #endif static caddr_t -smbios_parse_table(const caddr_t addr, const int ver) +smbios_parse_table(const caddr_t addr) { caddr_t cp; int proc, size, osize, type; @@ -206,7 +231,7 @@ smbios_parse_table(const caddr_t addr, c smbios_setenv("smbios.system.version", addr, 0x06); #ifdef SMBIOS_SERIAL_NUMBERS smbios_setenv("smbios.system.serial", addr, 0x07); - smbios_setuuid("smbios.system.uuid", addr + 0x08, ver); + smbios_setuuid("smbios.system.uuid", addr + 0x08, smbios.ver); #endif break; @@ -248,9 +273,9 @@ smbios_parse_table(const caddr_t addr, c */ proc = SMBIOS_GET8(addr, 0x18); if ((proc & 0x07) == 1) - smbios_enabled_sockets++; + smbios.enabled_sockets++; if ((proc & 0x40) != 0) - smbios_populated_sockets++; + smbios.populated_sockets++; break; case 6: /* 3.3.7 Memory Module Information (Type 6, Obsolete) */ @@ -268,7 +293,7 @@ smbios_parse_table(const caddr_t addr, c */ osize = SMBIOS_GET8(addr, 0x0a) & 0x7f; if (osize > 0 && osize < 22) - smbios_old_enabled_memory += 1 << (osize + 10); + smbios.old_enabled_memory += 1 << (osize + 10); break; case 17: /* 3.3.18 Memory Device (Type 17) */ @@ -282,7 +307,7 @@ smbios_parse_table(const caddr_t addr, c */ size = SMBIOS_GET16(addr, 0x0c); if (size != 0 && size != 0xffff) - smbios_enabled_memory += (size & 0x8000) != 0 ? + smbios.enabled_memory += (size & 0x8000) != 0 ? (size & 0x7fff) : (size << 10); break; @@ -298,54 +323,118 @@ smbios_parse_table(const caddr_t addr, c return (cp + 2); } +static void +smbios_probe(void) +{ + caddr_t saddr, info; + u_int32_t paddr; + + if (smbios.probed) + return; + smbios.probed = 1; + + /* Search signatures and validate checksums. */ + saddr = smbios_sigsearch(PTOV(SMBIOS_START), SMBIOS_LENGTH); + if (saddr == NULL) + return; + + smbios.length = SMBIOS_GET16(saddr, 0x16); /* Structure Table Length */ + paddr = SMBIOS_GET32(saddr, 0x18); /* Structure Table Address */ + smbios.count = SMBIOS_GET16(saddr, 0x1c); /* No of SMBIOS Structures */ + smbios.ver = SMBIOS_GET8(saddr, 0x1e); /* SMBIOS BCD Revision */ + + if (smbios.ver != 0) { + smbios.major = smbios.ver >> 4; + smbios.minor = smbios.ver & 0x0f; + if (smbios.major > 9 || smbios.minor > 9) + smbios.ver = 0; + } + if (smbios.ver == 0) { + smbios.major = SMBIOS_GET8(saddr, 0x06);/* SMBIOS Major Version */ + smbios.minor = SMBIOS_GET8(saddr, 0x07);/* SMBIOS Minor Version */ + } + smbios.ver = (smbios.major << 8) | smbios.minor; + smbios.addr = PTOV(paddr); + + /* Get system information from SMBIOS */ + info = smbios_find_struct(0x00); + if (info != NULL) { + smbios.bios_vendor = smbios_getstring(info, 0x04); + } + info = smbios_find_struct(0x01); + if (info != NULL) { + smbios.maker = smbios_getstring(info, 0x04); + smbios.product = smbios_getstring(info, 0x05); + } +} + +static caddr_t +smbios_find_struct(int type) +{ + caddr_t dmi; + int i; + + if (smbios.addr == NULL) + return (NULL); + + for (dmi = smbios.addr, i = 0; + dmi < smbios.addr + smbios.length && i < smbios.count; i++) { + if (SMBIOS_GET8(dmi, 0) == type) + return dmi; + /* Find structure terminator. */ + dmi = SMBIOS_GETSTR(dmi); + while (SMBIOS_GET16(dmi, 0) != 0) + dmi++; + dmi += 2; + } + + return (NULL); +} + void smbios_detect(void) { char buf[16]; - caddr_t addr, dmi, smbios; - size_t count, length; - uint32_t paddr; - int i, major, minor, ver; + caddr_t dmi; + int i; - /* Search signatures and validate checksums. */ - smbios = smbios_sigsearch(PTOV(SMBIOS_START), SMBIOS_LENGTH); - if (smbios == NULL) + smbios_probe(); + if (smbios.addr == NULL) return; - length = SMBIOS_GET16(smbios, 0x16); /* Structure Table Length */ - paddr = SMBIOS_GET32(smbios, 0x18); /* Structure Table Address */ - count = SMBIOS_GET16(smbios, 0x1c); /* No of SMBIOS Structures */ - ver = SMBIOS_GET8(smbios, 0x1e); /* SMBIOS BCD Revision */ - - if (ver != 0) { - major = ver >> 4; - minor = ver & 0x0f; - if (major > 9 || minor > 9) - ver = 0; - } - if (ver == 0) { - major = SMBIOS_GET8(smbios, 0x06); /* SMBIOS Major Version */ - minor = SMBIOS_GET8(smbios, 0x07); /* SMBIOS Minor Version */ - } - ver = (major << 8) | minor; - - addr = PTOV(paddr); - for (dmi = addr, i = 0; dmi < addr + length && i < count; i++) - dmi = smbios_parse_table(dmi, ver); + for (dmi = smbios.addr, i = 0; + dmi < smbios.addr + smbios.length && i < smbios.count; i++) + dmi = smbios_parse_table(dmi); - sprintf(buf, "%d.%d", major, minor); + sprintf(buf, "%d.%d", smbios.major, smbios.minor); setenv("smbios.version", buf, 1); - if (smbios_enabled_memory > 0 || smbios_old_enabled_memory > 0) { - sprintf(buf, "%u", smbios_enabled_memory > 0 ? - smbios_enabled_memory : smbios_old_enabled_memory); + if (smbios.enabled_memory > 0 || smbios.old_enabled_memory > 0) { + sprintf(buf, "%u", smbios.enabled_memory > 0 ? + smbios.enabled_memory : smbios.old_enabled_memory); setenv("smbios.memory.enabled", buf, 1); } - if (smbios_enabled_sockets > 0) { - sprintf(buf, "%u", smbios_enabled_sockets); + if (smbios.enabled_sockets > 0) { + sprintf(buf, "%u", smbios.enabled_sockets); setenv("smbios.socket.enabled", buf, 1); } - if (smbios_populated_sockets > 0) { - sprintf(buf, "%u", smbios_populated_sockets); + if (smbios.populated_sockets > 0) { + sprintf(buf, "%u", smbios.populated_sockets); setenv("smbios.socket.populated", buf, 1); } } + +static int +smbios_match_str(const char* s1, const char* s2) +{ + return (s1 == NULL || (s2 != NULL && !strcmp(s1, s2))); +} + +int +smbios_match(const char* bios_vendor, const char* maker, + const char* product) +{ + smbios_probe(); + return (smbios_match_str(bios_vendor, smbios.bios_vendor) && + smbios_match_str(maker, smbios.maker) && + smbios_match_str(product, smbios.product)); +} Modified: projects/clang360-import/sys/fs/smbfs/smbfs_subr.c ============================================================================== --- projects/clang360-import/sys/fs/smbfs/smbfs_subr.c Fri Jan 30 23:38:08 2015 (r277955) +++ projects/clang360-import/sys/fs/smbfs/smbfs_subr.c Fri Jan 30 23:57:39 2015 (r277956) @@ -170,8 +170,8 @@ smbfs_fname_tolocal(struct smb_vc *vcp, if (error) return error; */ - error = iconv_conv_case - (vcp->vc_tolocal, (const char **)&ibuf, &ilen, &obuf, &olen, copt); + error = iconv_conv_case(vcp->vc_tolocal, + __DECONST(const char **, &ibuf), &ilen, &obuf, &olen, copt); if (error && SMB_UNICODE_STRINGS(vcp)) { /* * If using unicode, leaving a file name as it was when Modified: projects/clang360-import/sys/fs/udf/udf_vnops.c ============================================================================== --- projects/clang360-import/sys/fs/udf/udf_vnops.c Fri Jan 30 23:38:08 2015 (r277955) +++ projects/clang360-import/sys/fs/udf/udf_vnops.c Fri Jan 30 23:57:39 2015 (r277956) @@ -526,8 +526,9 @@ udf_transname(char *cs0string, char *des } while (unilen > 0 && destleft > 0) { - udf_iconv->conv(udfmp->im_d2l, (const char **)&unibuf, - (size_t *)&unilen, (char **)&destname, &destleft); + udf_iconv->conv(udfmp->im_d2l, __DECONST(const char **, + &unibuf), (size_t *)&unilen, (char **)&destname, + &destleft); /* Unconverted character found */ if (unilen > 0 && destleft > 0) { *destname++ = '?'; Modified: projects/clang360-import/sys/netgraph/ng_parse.c ============================================================================== --- projects/clang360-import/sys/netgraph/ng_parse.c Fri Jan 30 23:38:08 2015 (r277955) +++ projects/clang360-import/sys/netgraph/ng_parse.c Fri Jan 30 23:57:39 2015 (r277956) @@ -1122,7 +1122,7 @@ ng_bytearray_parse(const struct ng_parse struct ng_parse_type subtype; subtype = ng_parse_bytearray_subtype; - *(const void **)&subtype.private = type->info; + subtype.private = __DECONST(void *, type->info); return ng_array_parse(&subtype, s, off, start, buf, buflen); } } @@ -1134,7 +1134,7 @@ ng_bytearray_unparse(const struct ng_par struct ng_parse_type subtype; subtype = ng_parse_bytearray_subtype; - *(const void **)&subtype.private = type->info; + subtype.private = __DECONST(void *, type->info); return ng_array_unparse(&subtype, data, off, cbuf, cbuflen); } @@ -1145,7 +1145,7 @@ ng_bytearray_getDefault(const struct ng_ struct ng_parse_type subtype; subtype = ng_parse_bytearray_subtype; - *(const void **)&subtype.private = type->info; + subtype.private = __DECONST(void *, type->info); return ng_array_getDefault(&subtype, start, buf, buflen); } Modified: projects/clang360-import/usr.sbin/bsdinstall/partedit/partedit_x86.c ============================================================================== --- projects/clang360-import/usr.sbin/bsdinstall/partedit/partedit_x86.c Fri Jan 30 23:38:08 2015 (r277955) +++ projects/clang360-import/usr.sbin/bsdinstall/partedit/partedit_x86.c Fri Jan 30 23:57:39 2015 (r277956) @@ -51,7 +51,10 @@ x86_bootmethod(void) const char * default_scheme(void) { - return ("GPT"); + if (strcmp(x86_bootmethod(), "UEFI") == 0) + return ("GPT"); + else + return ("MBR"); } int
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501302357.t0UNveKL058674>