Added support for Apple macOS

Author: cavaliercoder

Makefile

@@ -29,6 +29,12 @@ CFLAGS += -O2
 # Pass linker flags here
 LDFLAGS =
 
+# Flags for Apple macOS
+ifeq ($(shell uname -s),Darwin)
+	CFLAGS += -Wno-constant-logical-operand
+	LDFLAGS += -framework CoreServices -framework IOKit
+endif
+
 DESTDIR =
 prefix  = /usr/local
 sbindir = $(prefix)/sbin

config.h

@@ -22,7 +22,7 @@
 #endif
 
 /* Use memory alignment workaround or not */
-#ifdef __ia64__
+#if defined(__ia64__) || defined(__LP64__)
 #define ALIGNMENT_WORKAROUND
 #endif
 

dmidecode.c

@@ -58,6 +58,10 @@
  *    https://trustedcomputinggroup.org/pc-client-platform-tpm-profile-ptp-specification/
  */
 
+#if defined(__APPLE__)
+#include <Carbon/Carbon.h>
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <strings.h>
@@ -79,6 +83,7 @@ static const char *bad_index = "<BAD INDEX>";
 
 #define FLAG_NO_FILE_OFFSET     (1 << 0)
 #define FLAG_STOP_AT_EOT        (1 << 1)
+#define FLAG_FROM_API           (1 << 2)
 
 #define SYS_FIRMWARE_DIR "/sys/firmware/dmi/tables"
 #define SYS_ENTRY_FILE SYS_FIRMWARE_DIR "/smbios_entry_point"
@@ -4727,7 +4732,7 @@ static void dmi_table(off_t base, u32 len, u16 num, u32 ver, const char *devmem,
 			if (num)
 				printf("%u structures occupying %u bytes.\n",
 				       num, len);
-			if (!(opt.flags & FLAG_FROM_DUMP))
+			if (!(flags & FLAG_FROM_API) && !(opt.flags & FLAG_FROM_DUMP))
 				printf("Table at 0x%08llX.\n",
 				       (unsigned long long)base);
 		}
@@ -4758,6 +4763,61 @@ static void dmi_table(off_t base, u32 len, u16 num, u32 ver, const char *devmem,
 	else
 		buf = mem_chunk(base, len, devmem);
 
+#ifdef __APPLE__
+	// read tables returned by API call
+	if (flags & FLAG_FROM_API)
+	{
+		mach_port_t masterPort;
+		CFMutableDictionaryRef properties = NULL;
+		io_service_t service = MACH_PORT_NULL;
+		CFDataRef dataRef;
+
+		IOMasterPort(MACH_PORT_NULL, &masterPort);
+		service = IOServiceGetMatchingService(masterPort,
+			IOServiceMatching("AppleSMBIOS"));
+		if (service == MACH_PORT_NULL)
+		{
+			fprintf(stderr, "AppleSMBIOS service is unreachable, sorry.\n");
+			return;
+		}
+
+		if (kIOReturnSuccess != IORegistryEntryCreateCFProperties(service,
+			&properties, kCFAllocatorDefault, kNilOptions))
+		{
+			fprintf(stderr, "No data in AppleSMBIOS IOService, sorry.\n");
+			return;
+		}
+
+		if (!CFDictionaryGetValueIfPresent(properties, CFSTR( "SMBIOS"),
+			(const void **)&dataRef))
+		{
+			fprintf(stderr, "SMBIOS property data is unreachable, sorry.\n");
+			return;
+		}
+
+		len = CFDataGetLength(dataRef);
+		if((buf = malloc(sizeof(u8) * len)) == NULL)
+		{
+			perror("malloc");
+			return;
+		}
+
+		CFDataGetBytes(dataRef, CFRangeMake(0, len), (UInt8*)buf);
+
+		if (NULL != dataRef)
+			CFRelease(dataRef);
+
+		/*
+		 * This CFRelease throws 'Segmentation fault: 11' since macOS 10.12, if
+		 * the compiled binary is not signed with an Apple developer profile.
+		 */
+		if (NULL != properties)
+			CFRelease(properties);
+
+		IOObjectRelease(service);
+	}
+#endif // __APPLE__
+
 	if (buf == NULL)
 	{
 		fprintf(stderr, "Failed to read table, sorry.\n");
@@ -5052,6 +5112,55 @@ int main(int argc, char * const argv[])
 		goto done;
 	}
 
+#if defined(__APPLE__)
+	mach_port_t masterPort;
+	io_service_t service = MACH_PORT_NULL;
+	CFDataRef dataRef;
+
+	if (!(opt.flags & FLAG_QUIET))
+		printf("Getting SMBIOS data from Apple SMBIOS service.\n");
+
+	IOMasterPort(MACH_PORT_NULL, &masterPort);
+	service = IOServiceGetMatchingService(masterPort,
+		IOServiceMatching("AppleSMBIOS"));
+	if (service == MACH_PORT_NULL)
+	{
+		fprintf(stderr, "AppleSMBIOS service is unreachable, sorry.");
+		ret = 1;
+		goto exit_free;
+	}
+
+	dataRef = (CFDataRef) IORegistryEntryCreateCFProperty(service,
+		CFSTR("SMBIOS-EPS"), kCFAllocatorDefault, kNilOptions);
+
+	if (dataRef == NULL)
+	{
+		fprintf(stderr, "SMBIOS entry point is unreachable, sorry.\n");
+		ret = 1;
+		goto exit_free;
+	}
+
+	if((buf = malloc(0x20)) == NULL)
+	{
+		perror("malloc");
+		ret = 1;
+		goto exit_free;
+	}
+
+	CFDataGetBytes(dataRef, CFRangeMake(0, 0x20), (UInt8*)buf);
+
+	if (NULL != dataRef)
+		CFRelease(dataRef);
+	IOObjectRelease(service);
+
+	if (smbios_decode(buf, NULL, FLAG_FROM_API))
+	{
+		found++;
+		goto done;
+	}
+
+#endif // __APPLE__
+
 	/*
 	 * First try reading from sysfs tables.  The entry point file could
 	 * contain one of several types of entry points, so read enough for