diff --git a/Zenith-latest-2020-03-03-21_30_17.iso b/Zenith-latest-2020-03-03-23_38_04.iso similarity index 99% rename from Zenith-latest-2020-03-03-21_30_17.iso rename to Zenith-latest-2020-03-03-23_38_04.iso index 0189c6ab..533ccdd7 100755 Binary files a/Zenith-latest-2020-03-03-21_30_17.iso and b/Zenith-latest-2020-03-03-23_38_04.iso differ diff --git a/src/Apps/Budget/Budget.CC b/src/Apps/Budget/Budget.CC index 04f4b548..c6a1c999 100755 --- a/src/Apps/Budget/Budget.CC +++ b/src/Apps/Budget/Budget.CC @@ -35,7 +35,7 @@ class CBgtEntry #define BT_ANNUAL 5 DefineListLoad("ST_BGT_TEMPLATE_TYPES", - "Null\0Interval\0Monthly\0Bimonthly\0Semiannual\0Annual\0"); + "Null\0Interval\0Monthly\0Bimonthly\0Semiannual\0Annual"); class CBgtTemplate { diff --git a/src/Compiler/Asm.CC b/src/Compiler/Asm.CC index 3537dbab..99326be5 100755 --- a/src/Compiler/Asm.CC +++ b/src/Compiler/Asm.CC @@ -435,7 +435,7 @@ Bool ParseAsmInst(CCompCtrl *cc,CHashOpcode *tmpo,I64 argcount) CAsmArg *tmpa1,*tmpa2; Bool ModrM_complete,U8_avail=FALSE,found_second_possible=FALSE; CInst *tmpins; - CAsmIns cur,best; + CAsmInst cur,best; best.U8_count=255; if (argcount>0) @@ -452,7 +452,7 @@ Bool ParseAsmInst(CCompCtrl *cc,CHashOpcode *tmpo,I64 argcount) U8_avail=TRUE; if (Bt(&arg1mask,tmpins->arg1) && Bt(&arg2mask,tmpins->arg2) && (!(tmpins->flags&IEF_NOT_IN_64_BIT) || aotc->seg_size!=64)) { - MemSet(&cur,0,sizeof(CAsmIns)); + MemSet(&cur,0,sizeof(CAsmInst)); cur.tmpins=tmpins; ModrM_complete=FALSE; cur.is_default=ToBool(tmpins->flags & IEF_DEFAULT); @@ -798,7 +798,7 @@ Bool ParseAsmInst(CCompCtrl *cc,CHashOpcode *tmpo,I64 argcount) if (cur.U8_countflags & IEF_DONT_SWITCH_MODES && (cur.has_addr_prefix || cur.has_operand_prefix))) - MemCopy(&best,&cur,sizeof(CAsmIns)); + MemCopy(&best,&cur,sizeof(CAsmInst)); } } if (best.U8_count<255) { diff --git a/src/Home/MakeHome.CC b/src/Home/MakeHome.CC new file mode 100755 index 00000000..eace22e1 --- /dev/null +++ b/src/Home/MakeHome.CC @@ -0,0 +1,13 @@ +Cd(__DIR__);; + +//If these are not present in /Home, it uses the version in the root dir. You +//can make your own, modified, version of these files in your /Home directory. +#include "~/HomeLocalize" +#include "/Zenith/Boot/MakeBoot" +#include "/Zenith/Utils/MakeUtils" +#include "~/HomeWrappers" +MapFileLoad("::/Kernel/Kernel"); +MapFileLoad("::/Compiler/Compiler"); +#include "~/HomeKeyPlugins" +#include "~/HomeSys" +Cd("..");; diff --git a/src/Kernel/KernelA.HH b/src/Kernel/KernelA.HH index 8b533c04..f7abedc1 100755 --- a/src/Kernel/KernelA.HH +++ b/src/Kernel/KernelA.HH @@ -1964,7 +1964,7 @@ class CAsmNum2 Bool imm_flag; }; -class CAsmIns +class CAsmInst { CInst *tmpins; CAsmNum2 imm,disp;