move isAligned to HaskellLib

Isabelle2014 doesn't like defs to be less general than the consts declaration.

lib/HaskellLib_H.thy

@@ -30,7 +30,7 @@ abbreviation(input) bind_drop :: "('a, 'c) nondet_monad \<Rightarrow> ('a, 'b) n
   where "bind_drop \<equiv> (\<lambda>x y. bind x (K_bind y))"
 
 lemma bind_drop_test:
-  "foldr (op >>) x (return ()) = sequence_x x"
+  "foldr bind_drop x (return ()) = sequence_x x"
   by (rule ext, simp add: sequence_x_def)
 
 (* If the given monad is deterministic, this function converts
@@ -266,6 +266,8 @@ definition
   bit_def[simp]:
  "bit x \<equiv> shiftL 1 x"
 
+definition
+"isAligned x n \<equiv> x && mask n = 0"
 
 class integral = ord +
   fixes fromInteger :: "nat \<Rightarrow> 'a"

spec/design/KI_Decls_H.thy

@@ -97,8 +97,5 @@ createFreeSlotRegions :: "unit kernel_init"
 consts
 createEmptyRegions :: "unit kernel_init"
 
-consts
-isAligned :: "('a :: {minus, one, zero, plus, numeral, HS_bit}) \<Rightarrow> nat \<Rightarrow> bool"
-
 
 end

spec/design/KernelInit_H.thy

@@ -478,9 +478,6 @@ defs createEmptyRegions_def:
     provideRegion $ BootRegion l1magnitude maxBound BREmpty 0
 od)"
 
-defs isAligned_def:
-"isAligned x n \<equiv> x && mask n = 0"
-
 
 consts
   newKSDomSchedule :: "(domain \<times> machine_word) list"

spec/design/skel/KI_Decls_H.thy

@@ -16,6 +16,6 @@ imports
   KernelInitMonad_H
 begin
 
-#INCLUDE_HASKELL SEL4/Kernel/Init.lhs decls_only NOT funArray newKernelState distinct rangesBy InitData doKernelOp runInit
+#INCLUDE_HASKELL SEL4/Kernel/Init.lhs decls_only NOT isAligned funArray newKernelState distinct rangesBy InitData doKernelOp runInit
 
 end

spec/design/skel/KernelInit_H.thy

@@ -18,7 +18,7 @@ imports
   Config_H
 begin
 
-#INCLUDE_HASKELL SEL4/Kernel/Init.lhs bodies_only NOT funArray newKernelState distinct rangesBy InitData doKernelOp runInit
+#INCLUDE_HASKELL SEL4/Kernel/Init.lhs bodies_only NOT isAligned funArray newKernelState distinct rangesBy InitData doKernelOp runInit
 
 consts
   newKSDomSchedule :: "(domain \<times> machine_word) list"

spec/design/version

@@ -1,5 +1,5 @@
 Built from git repo at ../../../seL4/haskell by kleing
 
 Generated from changeset:
-3ffeaac Retire old dft package; resurrect Haskell manual.
+2261557 Fix IFC6410 build