* resources are working again

This commit is contained in:
peter 1999-08-25 16:41:04 +00:00
parent 01fc4505c9
commit da93f32ae0
4 changed files with 45 additions and 39 deletions

View File

@ -23,8 +23,10 @@
}
Unit catch;
{ go32v2 stack check goes nuts if ss is not the data selector (PM) }
{$S-}
{$ifdef go32v2}
{ go32v2 stack check goes nuts if ss is not the data selector (PM) }
{$S-}
{$endif}
interface
uses
@ -98,7 +100,10 @@ end.
{
$Log$
Revision 1.8 1999-08-10 12:27:15 pierre
Revision 1.9 1999-08-25 16:41:04 peter
* resources are working again
Revision 1.8 1999/08/10 12:27:15 pierre
* not stack check inside catch !!
Revision 1.7 1999/07/05 12:13:22 florian

View File

@ -36,7 +36,7 @@ implementation
uses
globtype,systems,
cobjects,verbose,globals,
cobjects,verbose,globals,files,
symconst,symtable,aasm,types,
hcodegen,temp_gen,pass_2,
cpubase,cpuasm,
@ -55,7 +55,7 @@ implementation
s : pasmsymbol;
popeax : boolean;
pushed : tpushed;
hr,resref : treference;
hr : treference;
begin
simple_loadn:=true;
@ -81,10 +81,7 @@ implementation
pushusedregisters(pushed,$ff);
emit_const(A_PUSH,S_L,
pconstsym(p^.symtableentry)^.resstrindex);
{ Now we must push the address of the
resourcestringtable of the unit the resourcestring is in,
it has label modulename^+'_RESOURCESTRINGLIST'
MVC }
emit_sym(A_PUSH,S_L,newasmsymbol(current_module^.modulename^+'_RESOURCESTRINGLIST'));
emitcall('FPC_GETRESOURCESTRING');
hregister:=getexplicitregister32(R_EAX);
@ -968,7 +965,10 @@ implementation
end.
{
$Log$
Revision 1.78 1999-08-25 11:59:43 jonas
Revision 1.79 1999-08-25 16:41:05 peter
* resources are working again
Revision 1.78 1999/08/25 11:59:43 jonas
* changed pai386, paippc and paiapha (same for tai*) to paicpu (taicpu)
Revision 1.77 1999/08/24 22:38:51 michael

View File

@ -87,10 +87,6 @@ function calc_resstring_hashvalue(P : Pchar; Len : longint) : longint;
---------------------------------------------------------------------}
Function AppendToResourceList(const name : string;p : pchar;len,hash : longint) : longint;
Var R : PResourceString;
Index : longint;
begin
If ResourceListCurrent<>Nil then
begin
@ -308,7 +304,10 @@ end;
end.
{
$Log$
Revision 1.11 1999-08-23 11:48:23 michael
Revision 1.12 1999-08-25 16:41:07 peter
* resources are working again
Revision 1.11 1999/08/23 11:48:23 michael
* resourcestrings ams list needs unitname prepended
Revision 1.10 1999/08/23 11:45:41 michael

View File

@ -274,9 +274,8 @@ begin
end;
Function GetResourceString(Const TheTable: TResourceStringTable;Index : longint) : AnsiString;[Public,Alias : 'FPC_GETRESOURCESTRING'];
begin
If (Index>0) and (Index<TheTAble.Count) then
If (Index>=0) and (Index<TheTAble.Count) then
Result:=TheTable.ResRec[Index].CurrentValue
else
Result:='';
@ -333,7 +332,10 @@ end.
{
$Log$
Revision 1.36 1999-08-24 22:42:56 michael
Revision 1.37 1999-08-25 16:41:08 peter
* resources are working again
Revision 1.36 1999/08/24 22:42:56 michael
* changed resourcestrings to new mechanism
Revision 1.35 1999/08/24 12:02:29 michael