Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1152a68c authored by Helge Deller's avatar Helge Deller Committed by Kyle McMartin
Browse files

parisc: use constants instead of numbers in assembly 



A few small fixups:
* _PAGE_SIZE_ENCODING_DEFAULT is wrong here, as one might assume that
  it's possible to define the page size that way. This is wrong. Use 0 instead.
* use constants instead of hardcoded numerical values in depi and extru
  while building the PFN out of the pte entry
* use SHRREG instead of extru (iitlba expects the PFN at bits {7..26})

Still wondering why we can use the same register (pte) as extru source
and target register, but it seems to work on PA1.1 and PA2.0...

Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Signed-off-by: default avatarKyle McMartin <kyle@mcmartin.ca>
parent 48d27cb2

arch/parisc/kernel/entry.S

+4 −4
Original line number Original line Diff line number Diff line
@@ -563,8 +563,8 @@ 




	/* Get rid of prot bits and convert to page addr for iitlba */

	/* Get rid of prot bits and convert to page addr for iitlba */





	depi		_PAGE_SIZE_ENCODING_DEFAULT,31,ASM_PFN_PTE_SHIFT,\pte

	depi		0,31,ASM_PFN_PTE_SHIFT,\pte

	extru		\pte,24,25,\pte

	SHRREG		\pte,(ASM_PFN_PTE_SHIFT-(31-26)),\pte

	.endm

	.endm





	/* This is for ILP32 PA2.0 only.  The TLB insertion needs

	/* This is for ILP32 PA2.0 only.  The TLB insertion needs
@@ -1337,8 +1337,8 @@ nadtlb_check_flush_11: 




	/* Get rid of prot bits and convert to page addr for idtlba */

	/* Get rid of prot bits and convert to page addr for idtlba */





	depi		0,31,12,pte

	depi		0,31,ASM_PFN_PTE_SHIFT,pte

	extru		pte,24,25,pte

	SHRREG		pte,(ASM_PFN_PTE_SHIFT-(31-26)),pte





	mfsp		%sr1,t0  /* Save sr1 so we can use it in tlb inserts */

	mfsp		%sr1,t0  /* Save sr1 so we can use it in tlb inserts */

	mtsp		spc,%sr1

	mtsp		spc,%sr1