mirror of
https://github.com/byteworksinc/ORCA-C.git
synced 2024-12-22 07:30:54 +00:00
Initial code to recognize 'long long' as a type.
This commit is contained in:
Stephen Heumann
parent
b1d4d8d668
commit
085cd7eb1b
@ -114,6 +114,7 @@ type
|
||||
{Misc.}
|
||||
{-----}
|
||||
long = record lsw,msw: integer; end; {for extracting words from longints}
|
||||
longlong = record low32,high32: longint; end; {64-bit integer representation}
|
||||
|
||||
cString = packed array [1..256] of char; {null terminated string}
|
||||
cStringPtr = ^cString;
|
||||
@ -146,7 +147,7 @@ type
|
||||
{ the compiler. Any values whose type is cc must be resolved to one }
|
||||
{ of the cg types before the code generator is called. }
|
||||
|
||||
baseTypeEnum = (cgByte,cgUByte,cgWord,cgUWord,cgLong,cgULong,
|
||||
baseTypeEnum = (cgByte,cgUByte,cgWord,cgUWord,cgLong,cgULong,cgQuad,cgUQuad,
|
||||
cgReal,cgDouble,cgComp,cgExtended,cgString,
|
||||
cgVoid,ccPointer);
|
||||
|
||||
@ -157,7 +158,7 @@ type
|
||||
|
||||
cTypeEnum = (ctChar, ctSChar, ctUChar, ctShort, ctUShort, ctInt, ctUInt,
|
||||
ctLong, ctULong, ctFloat, ctDouble, ctLongDouble, ctComp,
|
||||
ctVoid, ctInt32, ctUInt32, ctBool);
|
||||
ctVoid, ctInt32, ctUInt32, ctBool, ctLongLong, ctULongLong);
|
||||
|
||||
{tokens}
|
||||
{------}
|
||||
@ -316,6 +317,8 @@ type
|
||||
cgUWord,
|
||||
cgLong,
|
||||
cgULong : (iVal: longint);
|
||||
cgQuad,
|
||||
cgUQuad : (qVal: longlong);
|
||||
cgString : (sVal: longstringPtr);
|
||||
cgReal,
|
||||
cgDouble,
|
||||
|
||||
@ -239,6 +239,8 @@ var
|
||||
cgUWord: write('u');
|
||||
cgLong: write('l');
|
||||
cgULong: write('ul');
|
||||
cgQuad: write('q');
|
||||
cgUQuad: write('uq');
|
||||
cgReal: write('r');
|
||||
cgDouble: write('d');
|
||||
cgComp: write('c');
|
||||
|
||||
4
CGI.pas
4
CGI.pas
@ -204,6 +204,7 @@ const
|
||||
cgByteSize = 1;
|
||||
cgWordSize = 2;
|
||||
cgLongSize = 4;
|
||||
cgQuadSize = 8;
|
||||
cgPointerSize = 4;
|
||||
cgRealSize = 4;
|
||||
cgDoubleSize = 8;
|
||||
@ -246,6 +247,8 @@ type
|
||||
cgUWord : (opnd: longint; llab,slab: integer);
|
||||
cgLong,
|
||||
cgULong : (lval: longint);
|
||||
cgQuad,
|
||||
cgUQuad : (qval: longlong);
|
||||
cgReal,
|
||||
cgDouble,
|
||||
cgComp,
|
||||
@ -1291,6 +1294,7 @@ case tp of
|
||||
cgByte,cgUByte: TypeSize := cgByteSize;
|
||||
cgWord,cgUWord: TypeSize := cgWordSize;
|
||||
cgLong,cgULong: TypeSize := cgLongSize;
|
||||
cgQuad,cgUQuad: TypeSize := cgQuadSize;
|
||||
cgReal: TypeSize := cgRealSize;
|
||||
cgDouble: TypeSize := cgDoubleSize;
|
||||
cgComp: TypeSize := cgCompSize;
|
||||
|
||||
@ -18,7 +18,7 @@ uses CCommon, MM, Scanner, Symbol, CGI;
|
||||
{$segment 'SCANNER'}
|
||||
|
||||
const
|
||||
symFileVersion = 8; {version number of .sym file format}
|
||||
symFileVersion = 9; {version number of .sym file format}
|
||||
|
||||
var
|
||||
inhibitHeader: boolean; {should .sym includes be blocked?}
|
||||
|
||||
27
Parser.pas
27
Parser.pas
@ -2602,6 +2602,8 @@ var
|
||||
mySkipDeclarator: boolean; {value of skipDeclarator to generate}
|
||||
myTypeSpec: typePtr; {value of typeSpec to generate}
|
||||
myDeclarationModifiers: tokenSet; {all modifiers in this declaration}
|
||||
|
||||
isLongLong: boolean; {is this a "long long" type?}
|
||||
|
||||
procedure FieldList (tp: typePtr; kind: typeKind);
|
||||
|
||||
@ -2799,11 +2801,19 @@ var
|
||||
else if (typeSpecifiers = [longsy])
|
||||
or (typeSpecifiers = [signedsy,longsy])
|
||||
or (typeSpecifiers = [longsy,intsy])
|
||||
or (typeSpecifiers = [signedsy,longsy,intsy]) then
|
||||
myTypeSpec := longPtr
|
||||
or (typeSpecifiers = [signedsy,longsy,intsy]) then begin
|
||||
if isLongLong then
|
||||
myTypeSpec := longLongPtr
|
||||
else
|
||||
myTypeSpec := longPtr;
|
||||
end {else if}
|
||||
else if (typeSpecifiers = [unsignedsy,longsy])
|
||||
or (typeSpecifiers = [unsignedsy,longsy,intsy]) then
|
||||
myTypeSpec := uLongPtr
|
||||
or (typeSpecifiers = [unsignedsy,longsy,intsy]) then begin
|
||||
if isLongLong then
|
||||
myTypeSpec := uLongLongPtr
|
||||
else
|
||||
myTypeSpec := uLongPtr;
|
||||
end {else if}
|
||||
else if typeSpecifiers = [floatsy] then
|
||||
myTypeSpec := floatPtr
|
||||
else if typeSpecifiers = [doublesy] then
|
||||
@ -2829,6 +2839,7 @@ myDeclarationModifiers := [];
|
||||
typeSpecifiers := [];
|
||||
typeDone := false;
|
||||
isConstant := false;
|
||||
isLongLong := false;
|
||||
while token.kind in allowedTokens do begin
|
||||
case token.kind of
|
||||
{storage class specifiers}
|
||||
@ -2918,9 +2929,11 @@ while token.kind in allowedTokens do begin
|
||||
if typeDone then
|
||||
UnexpectedTokenError(expectedNext)
|
||||
else if token.kind in typeSpecifiers then begin
|
||||
if (token.kind = longsy)
|
||||
and (typeSpecifiers <= [signedsy,unsignedsy,longsy,intsy]) then
|
||||
Error(134)
|
||||
if (token.kind = longsy) and
|
||||
((myTypeSpec = longPtr) or (myTypeSpec = uLongPtr)) then begin
|
||||
isLongLong := true;
|
||||
ResolveType;
|
||||
end
|
||||
else
|
||||
UnexpectedTokenError(expectedNext);
|
||||
end {if}
|
||||
|
||||
@ -663,8 +663,8 @@ if list or (numErr <> 0) then begin
|
||||
131: msg := @'numeric constant is too long';
|
||||
132: msg := @'static assertion failed';
|
||||
133: msg := @'incomplete or function types may not be used here';
|
||||
134: msg := @'''long long'' types are not supported by ORCA/C';
|
||||
135: msg := @'the type _Bool is not supported by ORCA/C';
|
||||
{134: msg := @'''long long'' types are not supported by ORCA/C';}
|
||||
{135: msg := @'the type _Bool is not supported by ORCA/C';}
|
||||
136: msg := @'complex or imaginary types are not supported by ORCA/C';
|
||||
137: msg := @'atomic types are not supported by ORCA/C';
|
||||
138: msg := @'unsupported alignment';
|
||||
|
||||
25
Symbol.pas
25
Symbol.pas
@ -36,6 +36,8 @@
|
||||
{ uInt32Ptr - pointer to the base type for 32-bit unsigned int }
|
||||
{ longPtr - pointer to the base type for long }
|
||||
{ uLongPtr - pointer to the base type for unsigned long }
|
||||
{ longLongPtr - pointer to the base type for long long }
|
||||
{ uLongLongPtr - pointer to base type for unsigned long long }
|
||||
{ floatPtr - pointer to the base type for float }
|
||||
{ doublePtr - pointer to the base type for double }
|
||||
{ compPtr - pointer to the base type for comp }
|
||||
@ -77,8 +79,9 @@ var
|
||||
|
||||
{base types}
|
||||
charPtr,sCharPtr,uCharPtr,shortPtr,uShortPtr,intPtr,uIntPtr,int32Ptr,
|
||||
uInt32Ptr,longPtr,uLongPtr,floatPtr,doublePtr,compPtr,extendedPtr,
|
||||
boolPtr,stringTypePtr,voidPtr,voidPtrPtr,defaultStruct: typePtr;
|
||||
uInt32Ptr,longPtr,uLongPtr,longLongPtr,uLongLongPtr,boolPtr,
|
||||
floatPtr,doublePtr,compPtr,extendedPtr,stringTypePtr,voidPtr,
|
||||
voidPtrPtr,defaultStruct: typePtr;
|
||||
|
||||
{---------------------------------------------------------------}
|
||||
|
||||
@ -1306,6 +1309,24 @@ with uLongPtr^ do begin
|
||||
baseType := cgULong;
|
||||
cType := ctULong;
|
||||
end; {with}
|
||||
new(longLongPtr); {long long}
|
||||
with longLongPtr^ do begin
|
||||
size := cgQuadSize;
|
||||
saveDisp := 0;
|
||||
isConstant := false;
|
||||
kind := scalarType;
|
||||
baseType := cgQuad;
|
||||
cType := ctLongLong;
|
||||
end; {with}
|
||||
new(uLongLongPtr); {unsigned long}
|
||||
with uLongLongPtr^ do begin
|
||||
size := cgQuadSize;
|
||||
saveDisp := 0;
|
||||
isConstant := false;
|
||||
kind := scalarType;
|
||||
baseType := cgUQuad;
|
||||
cType := ctULongLong;
|
||||
end; {with}
|
||||
new(floatPtr); {real}
|
||||
with floatPtr^ do begin
|
||||
size := cgRealSize;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user