sinclairql: now the target short name is also sinclairql as proposed by Pierre, so it's unified everywhere

git-svn-id: trunk@47376 -
2025-04-05 21:28:21 +02:00 · 2020-11-10 21:31:04 +00:00 · 2020-11-10 21:31:04 +00:00 · 51d8ec90a7
commit 51d8ec90a7
parent e6b327b920
36 changed files with 39 additions and 39 deletions
--- a/compiler/msg/errore.msg
+++ b/compiler/msg/errore.msg
@ -4151,7 +4151,7 @@ F*2P<x>_Set target CPU (aarch64,arm,avr,i386,i8086,jvm,m68k,mips,mipsel,powerpc,
 6*2Tnetbsd_NetBSD
 6*2Tmacosclassic_Classic Mac OS
 6*2Tpalmos_PalmOS
-6*2Tql_Sinclair QL
+6*2Tsinclairql_Sinclair QL
 # i8086 targets
 8*2Tembedded_Embedded
 8*2Tmsdos_MS-DOS (and compatible)
--- a/compiler/systems/i_sinclairql.pas
+++ b/compiler/systems/i_sinclairql.pas
@ -33,7 +33,7 @@ unit i_sinclairql;
          (
            system       : system_m68k_sinclairql;
            name         : 'Sinclair QL';
-            shortname    : 'ql';
+            shortname    : 'sinclairql';
            flags        : [tf_use_8_3,tf_requires_proper_alignment,
                            tf_smartlink_sections,tf_under_development];
            cpu          : cpu_m68k;
@ -62,8 +62,8 @@ unit i_sinclairql;
            Cprefix      : '_';
            newline      : #13#10;
            dirsep       : '/'; { ... the underlying tools (binutils/vlink/vasm) prefer Unix paths }
-            assem        : as_m68k_as_aout;
-            assemextern  : as_m68k_as_aout;
+            assem        : as_m68k_vasm;
+            assemextern  : as_m68k_vasm;
            link         : ld_none;
            linkextern   : ld_sinclairql;
            ar           : ar_gnu_ar;
--- a/packages/bzip2/fpmake.pp
+++ b/packages/bzip2/fpmake.pp
@ -28,7 +28,7 @@ begin
    P.Email := '';
    P.Description := 'BZip2 decompression unit.';
    P.NeedLibC:= true;
-    P.OSes := P.OSes - [embedded,nativent,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql];
+    P.OSes := P.OSes - [embedded,nativent,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql];
    if Defaults.CPU=jvm then
      P.OSes := P.OSes - [java,android];

--- a/packages/chm/fpmake.pp
+++ b/packages/chm/fpmake.pp
@ -25,7 +25,7 @@ begin
    P.Email := '';
    P.Description := 'Standalone CHM reader and writer library';
    P.NeedLibC:= false;
-    P.OSes := P.OSes - [embedded,nativent,msdos,win16,macosclassic,palmos,atari,zxspectrum,msxdos,amstradcpc,watcom,ql];
+    P.OSes := P.OSes - [embedded,nativent,msdos,win16,macosclassic,palmos,atari,zxspectrum,msxdos,amstradcpc,watcom,sinclairql];
    if Defaults.CPU=jvm then
      P.OSes := P.OSes - [java,android];

--- a/packages/fcl-base/fpmake.pp
+++ b/packages/fcl-base/fpmake.pp
@ -26,7 +26,7 @@ begin
    P.Email := '';
    P.Description := 'Base library of Free Component Libraries (FCL), FPC''s OOP library.';
    P.NeedLibC:= false;
-    P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql];
+    P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql];
    if Defaults.CPU=jvm then
      P.OSes := P.OSes - [java,android];

--- a/packages/fcl-db/fpmake.pp
+++ b/packages/fcl-db/fpmake.pp
@ -32,7 +32,7 @@ begin
    P.Email := '';
    P.Description := 'Database library of Free Component Libraries(FCL), FPC''s OOP library.';
    P.NeedLibC:= false;
-    P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql];
+    P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql];
    if Defaults.CPU=jvm then
      P.OSes := P.OSes - [java,android];

--- a/packages/fcl-fpcunit/fpmake.pp
+++ b/packages/fcl-fpcunit/fpmake.pp
@ -30,7 +30,7 @@ begin
    P.Email := '';
    P.Description := 'Unit testing system inspired by JUnit of Free Component Libraries (FCL), FPC''s OOP library.';
    P.NeedLibC:= false;
-    P.OSes := P.OSes - [embedded,nativent,msdos,win16,macosclassic,palmos,symbian,zxspectrum,msxdos,amstradcpc,ql];
+    P.OSes := P.OSes - [embedded,nativent,msdos,win16,macosclassic,palmos,symbian,zxspectrum,msxdos,amstradcpc,sinclairql];
    if Defaults.CPU=jvm then
      P.OSes := P.OSes - [java,android];

--- a/packages/fcl-image/fpmake.pp
+++ b/packages/fcl-image/fpmake.pp
@ -28,7 +28,7 @@ begin
    P.Email := '';
    P.Description := 'Image loading and conversion parts of Free Component Libraries (FCL), FPC''s OOP library.';
    P.NeedLibC:= false;
-    P.OSes := P.OSes - [embedded,nativent,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql];
+    P.OSes := P.OSes - [embedded,nativent,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql];
    if Defaults.CPU=jvm then
      P.OSes := P.OSes - [java,android];

--- a/packages/fcl-js/fpmake.pp
+++ b/packages/fcl-js/fpmake.pp
@ -23,7 +23,7 @@ begin
    P.HomepageURL := 'www.freepascal.org';
    P.Email := 'michael@freepascal.org';
    P.Description := 'Javascript scanner/parser/syntax tree units';
-    P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql];
+    P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql];
    if Defaults.CPU=jvm then
      P.OSes := P.OSes - [java,android];

--- a/packages/fcl-json/fpmake.pp
+++ b/packages/fcl-json/fpmake.pp
@ -26,7 +26,7 @@ begin
    P.Email := '';
    P.Description := 'Json interfacing, part of Free Component Libraries (FCL), FPC''s OOP library.';
    P.NeedLibC:= false;
-    P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql];
+    P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql];
    if Defaults.CPU=jvm then
      P.OSes := P.OSes - [java,android];

--- a/packages/fcl-net/fpmake.pp
+++ b/packages/fcl-net/fpmake.pp
@ -30,7 +30,7 @@ begin
    P.Email := '';
    P.Description := 'Network related parts of Free Component Libraries (FCL), FPC''s OOP library.';
    P.NeedLibC:= false;
-    P.OSes:=P.OSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql];
+    P.OSes:=P.OSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql];
    if Defaults.CPU=jvm then
      P.OSes := P.OSes - [java,android];

--- a/packages/fcl-passrc/fpmake.pp
+++ b/packages/fcl-passrc/fpmake.pp
@ -25,7 +25,7 @@ begin
    P.Email := '';
    P.Description := 'Pascal parsing parts of Free Component Libraries (FCL), FPC''s OOP library.';
    P.NeedLibC:= false;
-    P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql];
+    P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql];
    if Defaults.CPU=jvm then
      P.OSes := P.OSes - [java,android];

--- a/packages/fcl-pdf/fpmake.pp
+++ b/packages/fcl-pdf/fpmake.pp
@ -24,7 +24,7 @@ begin
    P.Email := '';
    P.Description := 'PDF generating and TTF file info library';
    P.NeedLibC:= false;
-    P.OSes:=P.OSes-[embedded,win16,msdos,nativent,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql];
+    P.OSes:=P.OSes-[embedded,win16,msdos,nativent,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql];
    if Defaults.CPU=jvm then
      P.OSes := P.OSes - [java,android];

--- a/packages/fcl-process/fpmake.pp
+++ b/packages/fcl-process/fpmake.pp
@ -25,7 +25,7 @@ begin
    P.Description := 'Process (execution) related parts of Free Component Libraries (FCL), FPC''s OOP library.';
    P.Options.Add('-S2h');
    P.NeedLibC:= false;
-    P.OSes:=AllOSes-[embedded,msdos,win16,go32v2,nativent,macosclassic,palmos,atari,zxspectrum,msxdos,amstradcpc,ql];
+    P.OSes:=AllOSes-[embedded,msdos,win16,go32v2,nativent,macosclassic,palmos,atari,zxspectrum,msxdos,amstradcpc,sinclairql];
    if Defaults.CPU=jvm then
      P.OSes := P.OSes - [java,android];

--- a/packages/fcl-registry/fpmake.pp
+++ b/packages/fcl-registry/fpmake.pp
@ -27,7 +27,7 @@ begin
    P.Email := '';
    P.Description := 'Windows registry + emulation parts of Free Component Libraries (FCL), FPC''s OOP library.';
    P.NeedLibC:= false;
-    P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql];
+    P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql];
    if Defaults.CPU=jvm then
      P.OSes := P.OSes - [java,android];

--- a/packages/fcl-res/fpmake.pp
+++ b/packages/fcl-res/fpmake.pp
@ -27,7 +27,7 @@ begin
    P.Email := '';
    P.Description := 'Resource handling of Free Component Libraries (FCL), FPC''s OOP library.';
    P.NeedLibC:= false;
-    P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql];
+    P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql];
    if Defaults.CPU=jvm then
      P.OSes := P.OSes - [java,android];

--- a/packages/fcl-sdo/fpmake.pp
+++ b/packages/fcl-sdo/fpmake.pp
@ -25,7 +25,7 @@ begin
    P.HomepageURL := 'www.freepascal.org';
    P.Email := 'inoussa12@gmail.com';
    P.Description := 'Free Pascal implementation of Service Data Objects';
-    P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql];
+    P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql];
    if Defaults.CPU=jvm then
      P.OSes := P.OSes - [java,android];

--- a/packages/fcl-sound/fpmake.pp
+++ b/packages/fcl-sound/fpmake.pp
@ -26,7 +26,7 @@ begin
    P.Email := '';
    P.Description := 'Sound loading, storing and conversion parts for the Free Component Libraries (FCL), FPC''s OOP library.';
    P.NeedLibC:= false;
-    P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql];
+    P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql];
    if Defaults.CPU=jvm then
      P.OSes := P.OSes - [java,android];

--- a/packages/fcl-stl/fpmake.pp
+++ b/packages/fcl-stl/fpmake.pp
@ -25,7 +25,7 @@ begin
    P.Email := '';
    P.Description := 'Generic container library of Free Component Libraries (FCL), FPC''s OOP library.';
    P.NeedLibC:= false;
-    P.OSes:=AllOSes-[embedded,zxspectrum,msxdos,amstradcpc,ql];
+    P.OSes:=AllOSes-[embedded,zxspectrum,msxdos,amstradcpc,sinclairql];
    if Defaults.CPU=jvm then
      P.OSes := P.OSes - [java,android];

--- a/packages/fcl-xml/fpmake.pp
+++ b/packages/fcl-xml/fpmake.pp
@ -29,7 +29,7 @@ begin
    P.Email := '';
    P.Description := 'XML and DOM parts of Free Component Libraries (FCL), FPC''s OOP library.';
    P.NeedLibC:= false;
-    P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql];
+    P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql];
    if Defaults.CPU=jvm then
      P.OSes := P.OSes - [java,android];

--- a/packages/fpmkunit/fpmake.pp
+++ b/packages/fpmkunit/fpmake.pp
@ -25,7 +25,7 @@ begin
    P.Email := '';
    P.Description := 'Basic library of the fpmake/fppkg build system.';
    P.NeedLibC:= false;  // true for headers that indirectly link to libc?
-    P.OSes := P.OSes - [embedded,nativent,msdos,win16,atari,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql];
+    P.OSes := P.OSes - [embedded,nativent,msdos,win16,atari,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql];
    if Defaults.CPU=jvm then
      P.OSes := P.OSes - [java,android];

--- a/packages/fppkg/fpmake.pp
+++ b/packages/fppkg/fpmake.pp
@ -44,7 +44,7 @@ begin
    P.Email := '';
    P.Description := 'Libraries to create fppkg package managers.';
    P.NeedLibC:= false;
-    P.OSes := P.OSes - [embedded,nativent,msdos,win16,atari,macosclassic,palmos,symbian,zxspectrum,msxdos,amstradcpc,ql];
+    P.OSes := P.OSes - [embedded,nativent,msdos,win16,atari,macosclassic,palmos,symbian,zxspectrum,msxdos,amstradcpc,sinclairql];
    if Defaults.CPU=jvm then
      P.OSes := P.OSes - [java,android];

--- a/packages/hash/fpmake.pp
+++ b/packages/hash/fpmake.pp
@ -23,7 +23,7 @@ begin
    P.Email := '';
    P.Description := 'Several hash and cryptography algorithms (MD5,CRC,Linux crypt and NTLM1).';
    P.NeedLibC:= false;
-    P.OSes:=P.OSes-[embedded,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql];
+    P.OSes:=P.OSes-[embedded,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql];
    if Defaults.CPU=jvm then
      P.OSes := P.OSes - [java,android];

--- a/packages/hermes/fpmake.pp
+++ b/packages/hermes/fpmake.pp
@ -25,7 +25,7 @@ begin
    P.Email := '';
    P.Description := 'Library for pixel graphics conversion';
    P.NeedLibC := false;
-    P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql];
+    P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql];
    if Defaults.CPU=jvm then
      P.OSes := P.OSes - [java,android];

--- a/packages/libgd/fpmake.pp
+++ b/packages/libgd/fpmake.pp
@ -20,7 +20,7 @@ begin
 {$endif ALLPACKAGES}
    P.Version:='3.3.1';
    P.SourcePath.Add('src');
-    P.OSes := P.OSes - [embedded,nativent,msdos,wii,win16,atari,macosclassic,palmos,symbian,freertos,zxspectrum,msxdos,amstradcpc,ql];
+    P.OSes := P.OSes - [embedded,nativent,msdos,wii,win16,atari,macosclassic,palmos,symbian,freertos,zxspectrum,msxdos,amstradcpc,sinclairql];
    if Defaults.CPU=jvm then
      P.OSes := P.OSes - [java,android];

--- a/packages/libtar/fpmake.pp
+++ b/packages/libtar/fpmake.pp
@ -24,7 +24,7 @@ begin
    P.HomepageURL := 'http://www.destructor.de/';
    P.Description := 'Library for handling tar-files.';

-    P.OSes:=AllOSes-[embedded,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql];
+    P.OSes:=AllOSes-[embedded,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql];
    if Defaults.CPU=jvm then
      P.OSes := P.OSes - [java,android];

--- a/packages/pasjpeg/fpmake.pp
+++ b/packages/pasjpeg/fpmake.pp
@ -19,7 +19,7 @@ begin
    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
    P.Version:='3.3.1';
-    P.OSes:=P.OSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql];
+    P.OSes:=P.OSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql];
    if Defaults.CPU=jvm then
      P.OSes := P.OSes - [java,android];

--- a/packages/paszlib/fpmake.pp
+++ b/packages/paszlib/fpmake.pp
@ -20,7 +20,7 @@ begin
    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
    P.Version:='3.3.1';
-    P.OSes := P.OSes - [embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql];
+    P.OSes := P.OSes - [embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql];
    if Defaults.CPU=jvm then
      P.OSes := P.OSes - [java,android];

--- a/packages/regexpr/fpmake.pp
+++ b/packages/regexpr/fpmake.pp
@ -19,7 +19,7 @@ begin
    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
    P.Version:='3.3.1';
-    P.OSes:=P.OSes-[embedded,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql];
+    P.OSes:=P.OSes-[embedded,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql];
    if Defaults.CPU=jvm then
      P.OSes := P.OSes - [java,android];

--- a/packages/rtl-generics/fpmake.pp
+++ b/packages/rtl-generics/fpmake.pp
@ -23,7 +23,7 @@ begin
    P.Email := '';
    P.Description := 'Generic collection library.';
    P.NeedLibC:= false;
-    P.OSes := AllOSes-[embedded,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,watcom,ql];
+    P.OSes := AllOSes-[embedded,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,watcom,sinclairql];
    if Defaults.CPU=jvm then
      P.OSes := P.OSes - [java,android];

--- a/packages/sdl/fpmake.pp
+++ b/packages/sdl/fpmake.pp
@ -26,7 +26,7 @@ begin
       P.OSes := P.OSes - [darwin];
    P.OSes := P.OSes - [iphonesim,ios,java,os2,emx,go32v2,watcom,netware,netwlibc,nativent,embedded,
                        android,amiga,aros,msdos,gba,nds,win16,atari,macosclassic,palmos,symbian,wii,
-                        freertos,zxspectrum,msxdos,amstradcpc,ql];
+                        freertos,zxspectrum,msxdos,amstradcpc,sinclairql];

    T:=P.Targets.AddUnit('logger.pas');
      with T.Dependencies do
--- a/packages/symbolic/fpmake.pp
+++ b/packages/symbolic/fpmake.pp
@ -23,7 +23,7 @@ begin
    P.Email := '';
    P.Description := 'Expression parser with support for fast evaluation';
    P.NeedLibC:= false;
-    P.OSes:=P.OSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql];
+    P.OSes:=P.OSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql];
    if Defaults.CPU=jvm then
      P.OSes := P.OSes - [java,android];

--- a/packages/unzip/fpmake.pp
+++ b/packages/unzip/fpmake.pp
@ -20,7 +20,7 @@ begin
 {$endif ALLPACKAGES}
    P.Version:='3.3.1';
    P.SourcePath.Add('src');
-    P.OSes := P.OSes - [embedded,nativent,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql];
+    P.OSes := P.OSes - [embedded,nativent,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql];
    if Defaults.CPU=jvm then
      P.OSes := P.OSes - [java,android];

--- a/packages/webidl/fpmake.pp
+++ b/packages/webidl/fpmake.pp
@ -25,7 +25,7 @@ begin
    P.Email := '';
    P.Description := 'WEB IDL parser and converter to Object Pascal classes';
    P.NeedLibC:= false;
-    P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql];
+    P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql];
    if Defaults.CPU=jvm then
      P.OSes := P.OSes - [java,android];

--- a/rtl/sinclairql/Makefile.fpc
+++ b/rtl/sinclairql/Makefile.fpc
@ -29,7 +29,7 @@ fpcpackage=y

 [default]
 fpcdir=../..
-target=ql
+target=sinclairql
 cpu=m68k

 [compiler]
--- a/utils/fpcm/fpcmmain.pp
+++ b/utils/fpcm/fpcmmain.pp
@ -103,7 +103,7 @@ interface
        'win64','wince','gba','nds','embedded','symbian','nativent',
        'iphonesim', 'wii', 'aix', 'java', 'android', 'msdos', 'aros',
        'dragonfly', 'win16', 'wasm', 'freertos', 'zxspectrum', 'msxdos',
-        'ios','amstradcpc','ql'
+        'ios','amstradcpc','sinclairql'
      );

      OSSuffix : array[TOS] of string=(
@ -113,7 +113,7 @@ interface
        '_win64','_wince','_gba','_nds','_embedded','_symbian','_nativent',
        '_iphonesim','_wii','_aix','_java','_android','_msdos','_aros',
        '_dragonfly','_win16','_wasm','_freertos','_zxspectrum','_msxdos',
-        '_ios','_amstradcpc','_ql'
+        '_ios','_amstradcpc','_sinclairql'
      );

      { This table is kept OS,Cpu because it is easier to maintain (PFV) }