diff --git a/utils/TableGen/X86DisassemblerShared.h b/utils/TableGen/X86DisassemblerShared.h
index 9003cbfbdee..7fcd122b6b3 100644
--- a/utils/TableGen/X86DisassemblerShared.h
+++ b/utils/TableGen/X86DisassemblerShared.h
@@ -12,18 +12,18 @@
 
 #include <string>
 
-#define INSTRUCTION_SPECIFIER_FIELDS    \
-  bool                    filtered;     \
-  InstructionContext      insnContext;  \
-  std::string             name;         \
-                                        \
-  InstructionSpecifier() {              \
-    filtered = false;                   \
-    insnContext = IC;                   \
-    name = "";                          \
-    modifierType = MODIFIER_NONE;       \
-    modifierBase = 0;                   \
-    bzero(operands, sizeof(operands));  \
+#define INSTRUCTION_SPECIFIER_FIELDS       \
+  bool                    filtered;        \
+  InstructionContext      insnContext;     \
+  std::string             name;            \
+                                           \
+  InstructionSpecifier() {                 \
+    filtered = false;                      \
+    insnContext = IC;                      \
+    name = "";                             \
+    modifierType = MODIFIER_NONE;          \
+    modifierBase = 0;                      \
+    memset(operands, 0, sizeof(operands)); \
   }
 
 #define INSTRUCTION_IDS           \
diff --git a/utils/TableGen/X86DisassemblerTables.cpp b/utils/TableGen/X86DisassemblerTables.cpp
index 83284a77ba2..87e877ab192 100644
--- a/utils/TableGen/X86DisassemblerTables.cpp
+++ b/utils/TableGen/X86DisassemblerTables.cpp
@@ -238,7 +238,7 @@ DisassemblerTables::DisassemblerTables() {
   
   for (i = 0; i < 4; i++) {
     Tables[i] = new ContextDecision;
-    bzero(Tables[i], sizeof(ContextDecision));
+    memset(Tables[i], 0, sizeof(ContextDecision));
   }
   
   HasConflicts = false;