--- /dev/null	2014-11-20 14:38:51.000000000 -0800
+++ new/graal/com.oracle.graal.replacements.amd64/src/com/oracle/graal/replacements/amd64/AMD64Guards.java	2014-11-20 14:38:51.000000000 -0800
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.oracle.graal.replacements.amd64;
+
+import com.oracle.graal.api.code.*;
+import com.oracle.graal.api.replacements.*;
+import com.oracle.graal.amd64.*;
+
+public class AMD64Guards {
+    public static class CountLeadingZerosSupported implements SubstitutionGuard {
+        private AMD64 arch;
+
+        public CountLeadingZerosSupported(Architecture arch) {
+            this.arch = (AMD64) arch;
+        }
+
+        public boolean execute() {
+            return arch.getFlags().contains(AMD64.Flag.UseCountLeadingZerosInstruction);
+        }
+    }
+
+    public static class CountTrailingZerosSupported implements SubstitutionGuard {
+        private AMD64 arch;
+
+        public CountTrailingZerosSupported(Architecture arch) {
+            this.arch = (AMD64) arch;
+        }
+
+        public boolean execute() {
+            return arch.getFlags().contains(AMD64.Flag.UseCountTrailingZerosInstruction);
+        }
+    }
+}